Edit changelog a bit.

1 files changed, 13 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index b41a55b9f0..f3b603fe4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 Changes in version 0.2.5.7-rc - 2014-09-1x
   o Major bugfixes (client, startup):
-    - When Tor starts with DisabledNetwork set, it would correctly
-      conclude that it shouldn't try making circuits, but it would
-      mistakenly cache this conclusion and continue believing it even
-      when DisableNetwork is set to 0. Fixes the bug introduced by the
-      fix for bug 11200; bugfix on 0.2.5.4-alpha.
+    - Start making circuits as soon as DisabledNetwork is turned off.
+      When Tor started with DisabledNetwork set, it would correctly
+      conclude that it shouldn't build circuits, but it would mistakenly
+      cache this conclusion, and continue believing it even when
+      DisableNetwork is set to 0. Fixes the bug introduced by the fix
+      for bug 11200; bugfix on 0.2.5.4-alpha.
     - Resume expanding abbreviations for command-line options. The fix
       for bug 4647 accidentally removed our hack from bug 586 that
       rewrote HashedControlPassword to __HashedControlSessionPassword
@@ -19,10 +20,10 @@ Changes in version 0.2.5.7-rc - 2014-09-1x
     - Avoid queuing or sending destroy cells for circuit ID zero when we
       fail to send a CREATE cell. Fixes bug 12848; bugfix on 0.0.8pre1.
       Found and fixed by "cypherpunks".
-    - Correctly update the "local" mark on the controlling channel when
-      changing the address of an or_connection_t after the handshake.
-      Before this fix, ORPort reachability detection would sometimes
-      fail. Fixes bug #12160; bugfix on 0.2.4.4-alpha.
+    - Fix ORPort reachability detection on relays running behind a
+      proxy, by correctly updating the "local" mark on the controlling
+      channel when changing the address of an or_connection_t after the
+      handshake. Fixes bug #12160; bugfix on 0.2.4.4-alpha.
 
   o Minor features (bridge):
     - Add an ExtORPortCookieAuthFileGroupReadable option to make the
@@ -32,15 +33,13 @@ Changes in version 0.2.5.7-rc - 2014-09-1x
     - Update geoip and geoip6 to the August 7 2014 Maxmind GeoLite2
       Country database.
 
-  o Minor bugfixes (client):
+  o Minor bugfixes (logging):
     - Reduce the log severity of the "Pluggable transport proxy does not
       provide any needed transports and will not be launched." message,
       since Tor Browser includes several ClientTransportPlugin lines in
       its torrc-defaults file, leading every Tor Browser user who looks
       at her logs to see these notices and wonder if they're dangerous.
       Resolves bug 13124; bugfix on 0.2.5.3-alpha.
-
-  o Minor bugfixes (relay):
     - Downgrade "Unexpected onionskin length after decryption" warning
       to a protocol-warn, since there's nothing relay operators can do
       about a client that sends them a malformed create cell. Resolves
@@ -92,8 +91,8 @@ Changes in version 0.2.5.7-rc - 2014-09-1x
 
   o Documentation:
     - Adjust the URLs in the README to refer to the new locations of
-      several documents on the website. Patch from Matt Pagan. Fixes
-      bug 12830.
+      several documents on the website. Fixes bug 12830. Patch from
+      Matt Pagan.
     - Document 'reject6' and 'accept6' ExitPolicy entries. Resolves
       ticket 12878.