[tor-commits] [tor/release-0.2.9] Fold in one more changes entry

[nickm at torproject.org]

commit 330846ac087f7b327d77e118a2bcf96839befc60
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 8 07:15:18 2016 -0500

    Fold in one more changes entry
---
 ChangeLog        | 3 +++
 changes/bug20597 | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 772b619..3e542cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@ Changes in version 0.2.9.5-alpha - 2016-11-08
     - 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.
+    - When using exponential backoff in test networks, use a lower
+      exponent, so the delays do not vary as much. This helps test
+      networks bootstrap consistently. Fixes bug 20597; bugfix on 20499.
 
   o Minor features (geoip):
     - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2
diff --git a/changes/bug20597 b/changes/bug20597
deleted file mode 100644
index f199b63..0000000
--- a/changes/bug20597
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (test networks, exponential backoff):
-    - When using exponential backoff in test networks, use a lower exponent,
-      so the delays do not vary as much. This helps test networks bootstrap
-      consistently. Fixes bug 20597; bugfix on 20499; not in any released
-      version of tor.