Edit changelog

1 files changed, 24 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 48052570f5..f13cf11145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,42 +5,41 @@ Changes in version 0.2.6.10 - 2015-07-14
   Linux. Everyone running an older version, especially an older version
   of 0.2.6, should upgrade.
 
-  o Major bugfixes (crypto error-handling):
-    - If crypto_early_init fails, a typo in a return value from tor_init
-      means that tor_main continues running, rather than returning an
-      error value. Fixes bug 16360; bugfix on 0.2.5.2-alpha, introduced
-      when implementing 4900. Patch by "teor".
-
   o Major bugfixes (hidden service clients, stability):
-    - Revert commit 9407040c592184 of bug 14219 that indeed fixed an
-      issue but introduced a major hidden service reachability
+    - Stop refusing to store updated hidden service descriptors on a
+      client. This reverts commit 9407040c59218 (which indeed fixed bug
+      14219), but introduced a major hidden service reachability
       regression detailed in bug 16381. This is a temporary fix since we
-      can live with the minor issue in #14219 but the regression
-      introduced is too much of a set back.
+      can live with the minor issue in bug 14219 (it just results in
+      some load on the network) but the regression of 16381 is too much
+      of a setback.
 
-      To be clear, 14219 bug just results in some load on the network,
-      and some delay for the client when visiting a hidden service that
-      will ultimately fail.
-
-      Workaround for bug 16381; bugfix on tor-0.2.6.3-alpha~138.
+      First-round fix for bug 16381; bugfix on tor-0.2.6.3-alpha.
 
   o Major bugfixes (stability):
-    - Do not crash with an assertion error when parsing certain kinds of
-      malformed or truncated microdescriptors. Fixes bug 16400; bugfix
-      on 0.2.6.1-alpha. Found by "torkeln"; fix based on a patch
+    - Stop crashing with an assertion failure when parsing certain kinds
+      of malformed or truncated microdescriptors. Fixes bug 16400;
+      bugfix on 0.2.6.1-alpha. Found by "torkeln"; fix based on a patch
       by "cypherpunks_backup".
-    - Stop randomly crashing with an assertion failure when connecting
-      to a busy hidden service, or connecting to a hidden service while
-      a NEWNYM is in progress. Fixes bug 16013; bugfix on 0.1.0.1-rc.
+    - Stop random assertion failures that could occur when connecting to
+      a busy hidden service, or connecting to a hidden service while a
+      NEWNYM is in progress. Fixes bug 16013; bugfix on 0.1.0.1-rc.
 
-  o Minor features:
+  o Minor features (geoip):
     - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database.
     - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database.
 
+  o Minor bugfixes (crypto error-handling):
+    - Check for failures from crypto_early_init, and refuse to continue.
+      A previous typo meant that we could keep going with an
+      uninitialized crypto library, and would have OpenSSL initialize
+      its own PRNG. Fixes bug 16360; bugfix on 0.2.5.2-alpha, introduced
+      when implementing 4900. Patch by "teor".
+
   o Minor bugfixes (Linux seccomp2 sandbox):
-    - Allow pipe() and pipe2() syscalls; we need these when eventfd2()
-      support is missing. Fixes bug 16363; bugfix on 0.2.6.3-alpha.
-      Patch from "teor".
+    - Allow pipe() and pipe2() syscalls in the seccomp2 sandbox: we need
+      these when eventfd2() support is missing. Fixes bug 16363; bugfix
+      on 0.2.6.3-alpha. Patch from "teor".
 
 
 Changes in version 0.2.6.9 - 2015-06-11