Sort the 0257 changelog entries by section; combine two.

1 files changed, 22 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index ed30088874..2800351c91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,37 @@
 Changes in version 0.2.5.7-beta - 2014-08-??
-  o Major bugfixes:
+  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.
 
-  o Build fixes:
+  o Major bugfixes (relay):
+    - 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".
+
+  o Minor features (bridge):
+    - Add an ExtORPortCookieAuthFileGroupReadable option to make the
+      cookie file for the ExtORPort g+r by default.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the August 7 2014 Maxmind GeoLite2
+      Country database.
+
+  o Minor bugfixes (controller):
+    - Restore the functionality of CookieAuthFileGroupReadable. Fixes
+      bug 12864; bugfix on 0.2.5.1-alpha.
+
+  o Minor bugfixes (compilation):
     - Allow our autoconf to run correctly with autoconf 2.62 again.
       Fixes bug 12693; bugfix on 0.2.5.2-alpha.
+    - Fix compilation of test.h with MSVC. Patch from Gisle Vanem;
+      bugfix on 0.2.5.5-alpha.
 
-  o Distribution:
+  o Distribution (systemd):
     - Verify configuration file via ExecStartPre in the systemd unit
       file. Patch from intrigeri; resolves ticket 12730.
-
-  o Distribution:
     - Explicitly disable RunAsDaemon in the systemd unit file. Our
       current systemd unit uses "Type = simple", so systemd does not
       expect tor to fork. If the user has "RunAsDaemon 1" in their
@@ -29,31 +46,6 @@ Changes in version 0.2.5.7-beta - 2014-08-??
       several documents on the website. Patch from Matt Pagan. Fixes
       bug 12830.
 
-  o Major bugfixes (relay):
-    - 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".
-
-  o Minor bugfixes:
-    - Restore the functionality of CookieAuthFileGroupReadable. Fixes
-      bug 12864; bugfix on 0.2.5.1-alpha.
-
-  o Minor features:
-    - Add an ExtORPortCookieAuthFileGroupReadable option to make the
-      cookie file for the ExtORPort g+r by default.
-
-  o Minor features:
-    - Update geoip6 to the August 7 2014 Maxmind GeoLite2
-      Country database.
-
-  o Minor features:
-    - Update geoip to the August 7 2014 Maxmind GeoLite2
-      Country database.
-
-  o Minor bugfixes (compilation):
-    - Fix compilation of test.h with MSVC. Patch from Gisle Vanem;
-      bugfix on 0.2.5.5-alpha.
-
 
 Changes in version 0.2.5.6-alpha - 2014-07-28
   Tor 0.2.5.6-alpha brings us a big step closer to slowing down the