Reflow the changelog again

ChangeLog

@@ -2,42 +2,40 @@ Changes in version 0.2.6.2-alpha - 2014-12-??
   Tor 0.2.6.2-alpha is the second alpha release in the 0.2.6.x series.
 
   o Major features (relay, infrastructure):
+    - Completely revision of the code that relays use to decide which
+      cell to send next. Formerly, we selected the best circuit to write
+      on each channel, but we didn't select among channels in any
+      sophisticated way. Now, we choose the best circuits globally from
+      among those whose channels are ready to deliver traffic.
 
-    - Completely revision of the code that relays use to decide which cell to
+      This patch implements a new inter-cmux comparison API, a global
-      send next.  Formerly, we selected the best circuit to write on each
+      high/low watermark mechanism and a global scheduler loop for
-      channel, but we didn't select among channels in any sophisticated way.
+      transmission prioritization across all channels as well as among
-      Now, we choose the best circuits globally from among those whose
+      circuits on one channel. This schedule is currently tuned to
-      channels are ready to deliver traffic.
+      (tolerantly) avoid making changes in the current network
-
+      performance, but it should form the basis for major circuit
-      This patch implements a new inter-cmux comparison API, a global high/low
+      performance increases. Code by Andrea; tuning by Rob Jansen;
-      watermark mechanism and a global scheduler loop for transmission
+      implements ticket 9262.
-      prioritization across all channels as well as among circuits on
-      one channel. This schedule is currently tuned to (tolerantly)
-      avoid making changes in the current network performance, but it
-      should form the basis for major circuit performance increases.
-      Code by Andrea; tuning by Rob Jansen; implements ticket 9262.
 
   o Major features (hidden services):
     - Add a HiddenServiceStatistics option that allows Tor relays to
-      gather and publish statistics the overall size and volume of hidden
+      gather and publish statistics the overall size and volume of
-      service usage.
+      hidden service usage. Specifically, when this option is turned on,
-      Specifically, when this option is turned on, an HSDir will publish
+      an HSDir will publish an approximate number of hidden services
-      an approximate number of hidden services that have published
+      that have published descriptors to it the past 24 hours. Also, if
-      descriptors to it the past 24 hours. Also, if a relay has acted as
+      a relay has acted as a hidden service rendezvous point, it will
-      a hidden service rendezvous point, it will publish the approximate
+      publish the approximate amount of rendezvous cells it has relayed
-      amount of rendezvous cells it has relayed the past 24 hours. The
+      the past 24 hours. The statistics themselves are obfuscated so
-      statistics themselves are obfuscated so that the exact values
+      that the exact values cannot be derived. For more details see
-      cannot be derived. For more details see proposal 238, "Better
+      proposal 238, "Better hidden service stats from Tor relays". This
-      hidden service stats from Tor relays". This feature is currently
+      feature is currently disabled by default. Implements feature 13192.
-      disabled by default. Implements feature 13192.
 
   o Major bugfixes (hidden services):
-    - When closing an introduction circuit that was opened in parallel with
+    - When closing an introduction circuit that was opened in parallel
-      others,
+      with others, don't mark the introduction point as unreachable.
-      don't mark the introduction point as unreachable. Previously, the
+      Previously, the first successful connection to an introduction
-      first successful connection to an introduction point would make
+      point would make the other introduction points get marked as
-      the other introduction points get marked as having timed out.
+      having timed out. Fixes bug 13698; bugfix on 0.0.6rc2.
-      Fixes bug 13698; bugfix on 0.0.6rc2.
 
   o Minor features (client):
     - Validate hostnames in SOCKS5 requests more strictly. If SafeSocks
@@ -66,8 +64,8 @@ Changes in version 0.2.6.2-alpha - 2014-12-??
       from "anon", David Stainton, and "meejah". Closes ticket 11291.
 
   o Minor features (transparent firewall):
-    - Update the transparent proxy option checks to allow for both ipfw and
+    - Update the transparent proxy option checks to allow for both ipfw
-      pf on OS X.  Closes ticket 14002.
+      and pf on OS X. Closes ticket 14002.
 
   o Minor bugfixes (client, micordescriptors):
     - Use a full 256 bits of the SHA256 digest of a microdescriptor when
@@ -85,24 +83,23 @@ Changes in version 0.2.6.2-alpha - 2014-12-??
       char assignment to self, tautological compare, and additional
       parentheses around equality tests. Fixes bug 13577; bugfix
       on 0.2.5.4-alpha.
-    - Fix a clang warning about checking whether an address in the middle of a
+    - Fix a clang warning about checking whether an address in the
-      structure is NULL.  Fixes bug
+      middle of a structure is NULL. Fixes bug 14001; bugfix
-      14001; bugfix on 0.2.1.2-alpha.
+      on 0.2.1.2-alpha.
 
   o Minor bugfixes (hidden services):
     - Correctly send a controller event when we find that a rendezvous
-      circuit has finished.
+      circuit has finished. Fixes bug 13936; bugfix on 0.1.1.5-alpha.
-      Fixes bug 13936; bugfix on 0.1.1.5-alpha.
     - Pre-check directory permissions for new hidden-services to avoid
       at least one case of "Bug: Acting on config options left us in a
       broken state. Dying." Fixes bug 13942; bugfix on 0.0.6pre1.
-    - When adding a new hidden service (for example, via SETCONF), Tor no
+    - When adding a new hidden service (for example, via SETCONF), Tor
-      longer congratulates the user for running a relay. Fixes bug
+      no longer congratulates the user for running a relay. Fixes bug
       13941; bugfix on 0.2.6.1-alpha.
-    - When fetching hidden service descriptors, we now check not only for
+    - When fetching hidden service descriptors, we now check not only
-      whether we got the hidden service we had in mind, but also whether
+      for whether we got the hidden service we had in mind, but also
-      we got the particular descriptors we wanted. This prevents a class
+      whether we got the particular descriptors we wanted. This prevents
-      of inefficient but annoying DoS attacks by hidden service
+      a class of inefficient but annoying DoS attacks by hidden service
       directories. Fixes bug 13214; bugfix on 0.2.1.6-alpha. Reported
       by "special".
 
@@ -116,10 +113,10 @@ Changes in version 0.2.6.2-alpha - 2014-12-??
       on 0.0.6.
 
   o Minor bugfixes (misc):
-
+    - Stop allowing invalid address patterns like "*/24" that contain
-    - Stop allowing invalid address patterns like "*/24" that contain both a wildcard
+      both a wildcard address and a bit prefix length. This affects all
-      address and a bit prefix length. This
+      our address-range parsing code. Fixes bug 7484; bugfix
-      affects all our address-range parsing code. Fixes bug 7484; bugfix on 0.0.2pre14.
+      on 0.0.2pre14.
 
   o Code simplification and refactoring:
     - Stop using can_complete_circuits as a global variable; access it