[tor-commits] [tor/release-0.4.2] Sort 0.4.2.6 changelog.

[nickm at torproject.org]

commit 4177746f96aa2bcc074fb2d64d8780f90a006228
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 29 19:56:02 2020 -0500

    Sort 0.4.2.6 changelog.
---
 ChangeLog | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a4b0a678..33aec7cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,16 +14,29 @@ Changes in version 0.4.2.6 - 2020-01-3x
       experimental sandbox is enabled. Fixes bug 32841; bugfix on
       0.4.1.7. Patch by Peter Gerber.
 
+  o Minor bugfixes (correctness checks, backport from 0.4.3.1-alpha):
+    - Use GCC/Clang's printf-checking feature to make sure that
+      tor_assertf() arguments are correctly typed. Fixes bug 32765;
+      bugfix on 0.4.1.1-alpha.
+
   o Minor bugfixes (logging, crash, backport from 0.4.3.1-alpha):
     - Avoid a possible crash when trying to log a (fatal) assertion
       failure about mismatched magic numbers in configuration objects.
       Fixes bug 32771; bugfix on 0.4.2.1-alpha.
 
+  o Minor bugfixes (testing, backport from 0.4.3.1-alpha):
+    - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the
+      test_practracker.sh script. Doing so caused a test failure. Fixes
+      bug 32705; bugfix on 0.4.2.1-alpha.
+    - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr when
+      skipping practracker checks. Fixes bug 32705; bugfix
+      on 0.4.2.1-alpha.
+
   o Minor bugfixes (windows service, backport from 0.4.3.1-alpha):
     - Initialize the publish/subscribe system when running as a windows
       service. Fixes bug 32778; bugfix on 0.4.1.1-alpha.
 
-  o Testing (backport from 0.4.3.1-alpha)
+  o Testing (backport from 0.4.3.1-alpha):
     - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on
       Ubuntu Bionic. Turning off the Sandbox is a work-around, until we
       fix the sandbox errors in 32722. Closes ticket 32240.
@@ -35,19 +48,6 @@ Changes in version 0.4.2.6 - 2020-01-3x
   o Testing (continuous integration, backport from 0.4.3.1-alpha):
     - Use zstd in our Travis Linux builds. Closes ticket 32242.
 
-  o Minor bugfixes (testing, backport from 0.4.3.1-alpha):
-    - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the
-      test_practracker.sh script. Doing so caused a test failure. Fixes
-      bug 32705; bugfix on 0.4.2.1-alpha.
-    - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr when
-      skipping practracker checks. Fixes bug 32705; bugfix
-      on 0.4.2.1-alpha.
-
-  o Minor bugfixes (correctness checks, backport from 0.4.3.1-alpha):
-    - Use GCC/Clang's printf-checking feature to make sure that
-      tor_assertf() arguments are correctly typed. Fixes bug 32765;
-      bugfix on 0.4.1.1-alpha.
-
 
 Changes in version 0.4.2.5 - 2019-12-09
   This is the first stable release in the 0.4.2.x series. This series