[tor-commits] [tor/master] lightly sort changelog entries

[nickm@xxxxxxxxxxxxxx]

commit 5ae1a574dc11035fcea915948943c9a0a2082eae
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 3 12:24:47 2019 -0400

    lightly sort changelog entries
---
 ChangeLog | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 915509cfa..6f1e09dd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,22 +1,22 @@
 Changes in version 0.4.2.2-alpha - 2019-10-0?
   This release fixes several bugs from the previous alpha release.
 
+  o Major features (directory authorities):
+    - Directory authorities now reject relays running all currently
+      deprecated release series. The currently supported release series
+      are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549.
+
   o Major bugfixes (embedded Tor):
     - Avoid a possible crash when restarting Tor in embedded mode and
       enabling a different set of publish/subscribe messages. Fixes bug
       31898; bugfix on 0.4.1.1-alpha.
 
-  o Major bugfixes (torrc):
+  o Major bugfixes (torrc parsing):
     - Stop ignoring torrc options after an %include directive, when the
       included directory ends with a file that does not contain any
       config options. (But does contain comments or whitespace.) Fixes
       bug 31408; bugfix on 0.3.1.1-alpha.
 
-  o Minor features (authority):
-    - Directory authorities now reject relays running all currently
-      deprecated release series. The currently supported release series
-      are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549.
-
   o Minor features (auto-formatting scripts):
     - When annotating C macros, never generate a line that our check-
       spaces script would reject. Closes ticket 31759.
@@ -48,7 +48,7 @@ Changes in version 0.4.2.2-alpha - 2019-10-0?
       services by pointing them to the right documentation. Closes
       ticket 28966.
 
-  o Minor bugfixes (Appveyor CI):
+  o Minor bugfixes (Appveyor continuous integration):
     - Avoid spurious errors when Appveyor CI fails before the install
       step. Fixes bug 31884; bugfix on 0.3.4.2-alpha.
 
@@ -105,6 +105,8 @@ Changes in version 0.4.2.2-alpha - 2019-10-0?
     - Use SEVERITY_MASK_IDX() to find the LOG_* mask indexes in the unit
       tests and fuzzers, rather than using hard-coded values. Closes
       ticket 31334.
+    - Interface for function `decrypt_desc_layer` cleaned up. Closes
+      ticket 31589.
 
   o Documentation:
     - Document the signal-safe logging behaviour in the tor man page.
@@ -117,10 +119,6 @@ Changes in version 0.4.2.2-alpha - 2019-10-0?
       This is based on the old "tor-guts.git" repository, which we are
       adopting and superseding. Closes ticket 31849.
 
-  o Code simplification and refactoring (onion services):
-    - Interface for function `decrypt_desc_layer` cleaned up. Closes
-      ticket 31589.
-
 
 Changes in version 0.4.1.6 - 2019-09-19
   This release backports several bugfixes to improve stability and



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits