[tor-commits] [tor/release-0.4.2] Minor edits and sorting on 0.4.2.4-rc changelog

[nickm at torproject.org]

commit e3e25c09b7379d48829844dd6b98f19268851ec6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 12 16:46:14 2019 -0500

    Minor edits and sorting on 0.4.2.4-rc changelog
---
 ChangeLog | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 481fca074..a27be04d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,27 +6,15 @@ Changes in version 0.4.2.4-rc - 2019-11-??
     - Make pkg-config use --prefix when cross-compiling, if
       PKG_CONFIG_PATH is not set. Closes ticket 32191.
 
-  o Minor features (continuous integration):
-    - Use Ubuntu Bionic images for our Travis CI builds, so we can get a
-      recent version of coccinelle. But leave chutney on Ubuntu Trusty,
-      until we can fix some Bionic permissions issues (see ticket
-      32240). Related to ticket 31919.
-
   o Minor features (geoip):
     - Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2
       Country database. Closes ticket 32440.
 
-  o Minor bugfixes (CI, appveyor):
-    - Install the mingw OpenSSL package in Appveyor. This makes sure
-      that the OpenSSL headers and libraries match in Tor's Appveyor
-      builds. (This bug was triggered by an Appveyor image update.)
-      Fixes bug 32449; bugfix on 0.3.5.6-rc.
-
-  o Minor bugfixes (clietn, hidden service v3):
+  o Minor bugfixes (client, onion service v3):
     - Fix a BUG() assertion that occurs within a very small race window
-      between a client intro circuit opens and its descriptor that gets
-      cleaned up from the cache. The circuit is now closed which will
-      trigger a re-fetch of the descriptor and continue the HS
+      between when a client intro circuit opens and when its descriptor
+      gets cleaned up from the cache. The circuit is now closed early,
+      which will trigger a re-fetch of the descriptor and continue the
       connection. Fixes bug 28970; bugfix on 0.3.2.1-alpha.
 
   o Minor bugfixes (code quality):
@@ -46,8 +34,8 @@ Changes in version 0.4.2.4-rc - 2019-11-??
   o Minor bugfixes (directory):
     - When checking if a directory connection is anonymous, test if the
       circuit was marked for close before looking at its channel. This
-      avoids a BUG() stacktrace in case it was previously closed. Fixes
-      bug 31958; bugfix on 0.4.2.1-alpha.
+      avoids a BUG() stacktrace if the circuit was previously closed.
+      Fixes bug 31958; bugfix on 0.4.2.1-alpha.
 
   o Minor bugfixes (shellcheck):
     - Fix minor shellcheck errors in the git-*.sh scripts. Fixes bug
@@ -56,6 +44,14 @@ Changes in version 0.4.2.4-rc - 2019-11-??
       32402; bugfix on 0.4.2.1-alpha.
 
   o Testing (continuous integration):
+    - Use Ubuntu Bionic images for our Travis CI builds, so we can get a
+      recent version of coccinelle. But leave chutney on Ubuntu Trusty,
+      until we can fix some Bionic permissions issues (see ticket
+      32240). Related to ticket 31919.
+    - Install the mingw OpenSSL package in Appveyor. This makes sure
+      that the OpenSSL headers and libraries match in Tor's Appveyor
+      builds. (This bug was triggered by an Appveyor image update.)
+      Fixes bug 32449; bugfix on 0.3.5.6-rc.
     - In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241.