[tor-commits] [tor/master] Tweak blurb, re-sort changelog

[nickm at torproject.org]

commit 6b85ff95a283755ccf0caadb046ecaa5c988255c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 9 16:01:45 2018 -0500

    Tweak blurb, re-sort changelog
---
 ChangeLog | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a32897e03..bf9f2d5a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 Changes in version 0.3.3.2-alpha - 2018-02-09
-  Tor 0.3.3.2-alpha is the second alpha in the 0.3.3.x series.  It
+  Tor 0.3.3.2-alpha is the second alpha in the 0.3.3.x series. It
   introduces a mechanism to handle the high loads that many relays
   operators have been reporting recently. It also fixes several bugs in
-  older releases.  If this new code proves reliable, we plan to backport
+  older releases. If this new code proves reliable, we plan to backport
   it to older supported release series.
 
   o Major features (denial-of-service mitigation):
@@ -85,6 +85,14 @@ Changes in version 0.3.3.2-alpha - 2018-02-09
       hop's identity was set when the circuit failed. Fixes bug 24927;
       bugfix on 0.2.4.4-alpha.
 
+  o Minor bugfixes (logging):
+    - Don't treat inability to store a cached consensus object as a bug:
+      it can happen normally when we are out of disk space. Fixes bug
+      24859; bugfix on 0.3.1.1-alpha.
+    - Fix a (mostly harmless) race condition when invoking
+      LOG_PROTOCOL_WARN message from a subthread while the options are
+      changing. Fixes bug 23954; bugfix on 0.1.1.9-alpha.
+
   o Minor bugfixes (onion services):
     - Remove a BUG() statement which can be triggered in normal
       circumstances where a client fetches a descriptor that has a lower
@@ -94,14 +102,6 @@ Changes in version 0.3.3.2-alpha - 2018-02-09
       rendezvous points if tor is a single onion service. Fixes bug
       25116; bugfix on 0.2.9.6-rc;
 
-  o Minor bugfixes (logging):
-    - Don't treat inability to store a cached consensus object as a bug:
-      it can happen normally when we are out of disk space. Fixes bug
-      24859; bugfix on 0.3.1.1-alpha.
-    - Fix a (mostly harmless) race condition when invoking
-      LOG_PROTOCOL_WARN message from a subthread while the options are
-      changing. Fixes bug 23954; bugfix on 0.1.1.9-alpha.
-
   o Minor bugfixes (performance):
     - Avoid calling protocol_list_supports_protocol() from inside tight
       loops when running with cached routerinfo_t objects. Instead,