Light editing to 0.3.1.x changelog

1 files changed, 14 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index db31700464..2ec19522cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@ Changes in version 0.3.1.5-??? - 2017-08-01
   further bug or security fixes. Anyone still running or distributing
   one of those versions should upgrade.
 
-  o Major features (build system):
+  o Major features (build system, continuous integration):
     - Tor's repository now includes a Travis Continuous Integration (CI)
       configuration file (.travis.yml). This is meant to help new
       developers and contributors who fork Tor to a Github repository be
@@ -30,8 +30,8 @@ Changes in version 0.3.1.5-??? - 2017-08-01
       22883; bugfix on 0.3.1.1-alpha.
 
   o Minor features (bridge authority):
-    - Add "fingerprint" line to networkstatus-bridges produced by bridge
-      authorities. Closes ticket 22207.
+    - Add "fingerprint" lines to the networkstatus-bridges file produced
+      by bridge authorities. Closes ticket 22207.
 
   o Minor features (directory cache, consensus diff):
     - Add a new MaxConsensusAgeForDiffs option to allow directory cache
@@ -43,18 +43,16 @@ Changes in version 0.3.1.5-??? - 2017-08-01
   o Minor features (relay, performance):
     - Always start relays with at least two worker threads, to prevent
       priority inversion on slow tasks. Part of the fix for bug 22883.
-
-  o Minor features (relay, thread pool):
     - Allow background work to be queued with different priorities, so
       that a big pile of slow low-priority jobs will not starve out
       higher priority jobs. This lays the groundwork for a fix for
       bug 22883.
 
   o Minor bugfixes (build system, rust):
-    - Fix a problem with Rust toolchains not being found when building
-      without --enable-cargo-online-mode, due to setting the $HOME
-      environment variable instead of $CARGO_HOME. Fixes bug 22830;
-      bugfix on 0.3.1.1-alpha. Fix by Chelsea Komlo.
+    - Fix a problem where Rust toolchains were not being found when
+      building without --enable-cargo-online-mode, due to setting the
+      $HOME environment variable instead of $CARGO_HOME. Fixes bug
+      22830; bugfix on 0.3.1.1-alpha. Fix by Chelsea Komlo.
 
   o Minor bugfixes (compatibility, zstd):
     - Write zstd epilogues correctly when the epilogue requires
@@ -65,8 +63,6 @@ Changes in version 0.3.1.5-??? - 2017-08-01
   o Minor bugfixes (compilation warnings):
     - Suppress -Wdouble-promotion warnings with clang 4.0. Fixes bug
       22915; bugfix on 0.2.8.1-alpha.
-
-  o Minor bugfixes (Compilation):
     - Fix warnings when building with libscrypt and openssl scrypt
       support on Clang. Fixes bug 22916; bugfix on 0.2.7.2-alpha.
     - Compile correctly when both openssl 1.1.0 and libscrypt are
@@ -77,13 +73,7 @@ Changes in version 0.3.1.5-??? - 2017-08-01
       isfinite(), isnan(), and signbit(). Fixes bug 22801; bugfix
       on 0.2.8.1-alpha.
 
-  o Minor bugfixes (consensus diff):
-    - test_consdiff_base64cmp would fail on OS X because while OS X
-      follows the standard of (less than zero/zero/greater than zero),
-      it doesn't follow the convention of (-1/0/+1). Make the test
-      comply with the standard. Fixes bug 22870; bugfix on 0.3.1.1-alpha.
-
-  o Minor bugfixes (coverity builds):
+  o Minor bugfixes (coverity build support):
     - Avoid Coverity build warnings related to our BUG() macro. By
       default, Coverity treats BUG() as the Linux kernel does: an
       instant abort(). We need to override that so our BUG() macro
@@ -105,7 +95,7 @@ Changes in version 0.3.1.5-??? - 2017-08-01
       avoid codepage issues. Fixes bug 22520; bugfix on 0.1.2.8-alpha.
       Patch from "Vort".
 
-  o Minor bugfixes (file limits):
+  o Minor bugfixes (file limits, osx):
     - When setting the maximum number of connections allowed by the OS,
       always allow some extra file descriptors for other files. Fixes
       bug 22797; bugfix on 0.2.0.10-alpha.
@@ -114,12 +104,16 @@ Changes in version 0.3.1.5-??? - 2017-08-01
     - Avoid a sandbox failure when trying to re-bind to a socket and
       mark it as IPv6-only. Fixes bug 20247; bugfix on 0.2.5.1-alpha.
 
-  o Minor bugfixes (memory leak):
+  o Minor bugfixes (memory leaks):
     - Fix a small memory leak when validating a configuration that uses
       two or more AF_UNIX sockets for the same port type. Fixes bug
       23053; bugfix on 0.2.6.3-alpha. This is CID 1415725.
 
   o Minor bugfixes (unit tests):
+    - test_consdiff_base64cmp would fail on OS X because while OS X
+      follows the standard of (less than zero/zero/greater than zero),
+      it doesn't follow the convention of (-1/0/+1). Make the test
+      comply with the standard. Fixes bug 22870; bugfix on 0.3.1.1-alpha.
     - Fix a memory leak in the link-handshake/certs_ok_ed25519 test.
       Fixes bug 22803; bugfix on 0.3.0.1-alpha.