Fold new entries into changelog and edit lightly

12 files changed, 53 insertions, 56 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f3e248d85..83cc6ba541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,38 @@ Changes in version 0.2.9.5-alpha - 2016-11-07
       potentially wait a very long time. Fixes part of bug 19969; bugfix
       on 0.2.8.1-alpha.
 
+  o Major bugfixes (download scheduling):
+    - When using an exponential backoff schedule, do not give up on
+      downloading just because we have failed a bunch of times. Since
+      each delay is longer than the last, retrying indefinitely won't
+      hurt. Fixes bug 20536; bugfix on 0.2.9.1-alpha.
+    - If a consensus expires while we are waiting for certificates to
+      download, stop waiting for certificates.
+    - If we stop waiting for certificates less than a minute after we
+      started downloading them, do not consider the certificate download
+      failure a separate failure. Fixes bug 20533; bugfix
+      on 0.2.0.9-alpha.
+    - Remove the maximum delay on exponential-backoff scheduling. Since
+      we now allow an infinite number of failures (see ticket 20536), we
+      must now allow the time to grow longer on each failure. Fixes part
+      of bug 20534; bugfix on 0.2.9.1-alpha.
+    - Make our initial download delays closer to those from 0.2.8. Fixes
+      another part of bug 20534; bugfix on 0.2.9.1-alpha.
+    - When determining when to download a directory object, handle times
+      after 2038 if the operating system supports them. (Someday this
+      will be important!) Fixes bug 20587; bugfix on 0.2.8.1-alpha.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2
+      Country database.
+
+  o Minor bugfixes (client directory scheduling):
+    - Treat "relay too busy to answer request" as a failed request and a
+      reason to back off on our retry frequency. This is safe now that
+      exponential backups retry indefinitely, and avoids a bug where we
+      would reset our download schedule erroneously. Fixes bug 20593;
+      bugfix on 0.2.9.1-alpha.
+
   o Minor bugfixes (client, logging):
     - Remove a BUG warning in circuit_pick_extend_handshake(). Instead,
       assume all nodes support EXTEND2. Use ntor whenever a key is
@@ -22,10 +54,25 @@ Changes in version 0.2.9.5-alpha - 2016-11-07
     - On DNSPort, stop logging a BUG warning on a failed hostname
       lookup. Fixes bug 19869; bugfix on 0.2.9.1-alpha.
 
-  o Minor bugfixes (compilation):
+  o Minor bugfixes (hidden services):
+    - When configuring hidden services, check every hidden service
+      directory's permissions. Previously, we only checked the last
+      hidden service. Fixes bug 20529; bugfix on 13942 commit 85bfad1
+      in 0.2.6.2-alpha.
+
+  o Minor bugfixes (portability):
+    - Fix compilation with OpenSSL 1.1 and less commonly-used CPU
+      architectures. Closes ticket 20588.
+    - Use ECDHE ciphers instead of ECDH in tortls tests. LibreSSL has
+      removed the ECDH ciphers which caused the tests to fail on
+      platforms which use it. Fixes bug 20460; bugfix on 0.2.8.1-alpha.
     - Fix implicit conversion warnings under OpenSSL 1.1. Fixes bug
       20551; bugfix on 0.2.1.1-alpha.
 
+  o Minor bugfixes (relay bootstrap):
+    - Ensure relays don't make multiple connections during bootstrap.
+      Fixes bug 20591; bugfix on 0.2.8.1-alpha.
+
   o Minor bugfixes (relay):
     - Work around a memory leak in OpenSSL 1.1 when encoding public
       keys. Fixes bug 20553; bugfix on 0.0.2pre8.
@@ -35,6 +82,11 @@ Changes in version 0.2.9.5-alpha - 2016-11-07
       explicitly configuring us to do so, even if we do detect more than
       16 CPU cores. Fixes bug 19968; bugfix on 0.2.3.1-alpha.
 
+  o Minor bugfixes (single onion services):
+    - Start correctly when creating a single onion service in a
+      directory that did not previously exist. Fixes bug 20484; bugfix
+      on 0.2.9.3-alpha.
+
   o Minor bugfixes (testing):
     - Avoid a unit test failure on systems with over 16 detectable CPU
       cores. Fixes bug 19968; bugfix on 0.2.3.1-alpha.
diff --git a/changes/20460 b/changes/20460
deleted file mode 100644
index 9fbb4a7986..0000000000
--- a/changes/20460
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (testing):
-    - Use ECDHE ciphers instead of ECDH in tortls tests. LibreSSL has
-      removed the ECDH ciphers which caused the tests to fail on
-      platforms which use it. Fixes bug 20460; bugfix on 0.2.8.1-alpha.
diff --git a/changes/bug20484 b/changes/bug20484
deleted file mode 100644
index 9a0b95cb39..0000000000
--- a/changes/bug20484
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (single onion services):
-    - Start correctly when creating a single onion service in a
-      directory that did not previously exist. Fixes bug 20484; bugfix on
-      0.2.9.3-alpha.
-
diff --git a/changes/bug20529 b/changes/bug20529
deleted file mode 100644
index 276be5b2b6..0000000000
--- a/changes/bug20529
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (hidden services):
-    - When configuring hidden services, check every hidden service directory's
-      permissions. Previously, we only checked the last hidden service.
-      Fixes bug 20529; bugfix on 13942 commit 85bfad1 in 0.2.6.2-alpha.
diff --git a/changes/bug20533 b/changes/bug20533
deleted file mode 100644
index 7d1a456328..0000000000
--- a/changes/bug20533
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (consensus downloads):
-    - If a consensus expires while we are waiting for certificates to download,
-      stop waiting for certificates.
-    - If we stop waiting for certificates less than a minute after we started
-      downloading them, do not consider the certificate download failure a
-      separate failure.
-      Fixes bug 20533; bugfix on commit e0204f21 in 0.2.0.9-alpha.
diff --git a/changes/bug20534 b/changes/bug20534
deleted file mode 100644
index 49db433a01..0000000000
--- a/changes/bug20534
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes (directory download scheduling):
-    - Remove the maximum delay on exponential-backoff scheduling.
-      Since we now allow an infinite number of failures (see ticket
-      20536), we must now allow the time to grow longer on each failure.
-      Fixes part of bug 20534; bugfix on 0.2.9.1-alpha.
-    - Use initial delays and decrements in download scheduling closer to
-      those from 0.2.8. Fixes another part of bug 20534; bugfix on
-      0.2.9.1-alpha.
diff --git a/changes/bug20536 b/changes/bug20536
deleted file mode 100644
index 9e0dd164bb..0000000000
--- a/changes/bug20536
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (download scheduling):
-    - When using an exponential backoff schedule, do not give up on
-      dowloading just because we have failed a bunch of times.  Since
-      each delay is longer than the last, retrying indefinitely won't
-      hurt. Fixes bug 20536; bugfix on 0.2.9.1-alpha.
-
diff --git a/changes/bug20587 b/changes/bug20587
deleted file mode 100644
index 341b001363..0000000000
--- a/changes/bug20587
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (download timing):
-    - When determining when to download a directory object, handle times
-      after 2038 if the operating system supports that.  (Someday this will be
-      important!)  Fixes bug 20587; bugfix on 0.2.8.1-alpha.
-
diff --git a/changes/bug20588 b/changes/bug20588
deleted file mode 100644
index 832ef81336..0000000000
--- a/changes/bug20588
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (portability):
-    - Fix compilation with OpenSSL 1.1 and less commonly-used
-      CPU architectures. Closes ticket 20588.
diff --git a/changes/bug20591 b/changes/bug20591
deleted file mode 100644
index deaa738f5e..0000000000
--- a/changes/bug20591
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (relay bootstrap):
-    - Ensure relays don't make multiple connections during bootstrap.
-      Fixes bug 20591; bugfix on 0.2.8.1-alpha.
diff --git a/changes/bug20593 b/changes/bug20593
deleted file mode 100644
index e9f54d317a..0000000000
--- a/changes/bug20593
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (client directory scheduling):
-    - Treat "relay too busy to answer request" as a failed request and a
-      reason to back off on our retry frequency. This is safe now that
-      exponential backups retry indefinitely, and avoids a bug where we would
-      reset our download schedule erroneously.
-      Fixes bug 20593; bugfix on 0.2.9.1-alpha.
diff --git a/changes/geoip-november2016 b/changes/geoip-november2016
deleted file mode 100644
index b3f9913bb1..0000000000
--- a/changes/geoip-november2016
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (ge0oip):
-    - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2
-      Country database.
-