[tor-commits] [tor/release-0.2.8] Fold the last (I hope) two changes into the changelog

[nickm at torproject.org]

commit 619507a029e5c5bfdb353130451ae22a9cb423d8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 24 10:50:47 2016 -0400

    Fold the last (I hope) two changes into the changelog
---
 ChangeLog        | 18 +++++++++++++++---
 changes/bug19728 |  3 ---
 changes/bug19973 |  6 ------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2151173..9c80344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
 Changes in version 0.2.8.7 - 2016-08-2?
-  Tor 0.2.8.7 fixes a few bugs still present in 0.2.8.6, and replaces a
-  retiring bridge authority. All bridges and bridge users are strongly
-  encouraged to upgrade.
+  Tor 0.2.8.7 fixes an important bug related to the ReachableAddresses
+  option in 0.2.8.6, and replaces a retiring bridge authority. Everyone
+  who sets the ReachableAddresses option, all bridges, and all bridge
+  users are strongly encouraged to upgrade.
+
+  o Major bugfixes (client, security):
+    - Only use the ReachableAddresses option to restrict the first hop
+      in a path. Previously, it would apply to every hop in the path,
+      with a possible degredation in anonymity for anyone using an
+      uncommon ReachableAddress setting. Fixes bug 19973; bugfix
+      on 0.2.8.2-alpha.
 
   o Minor features (geoip):
     - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
@@ -17,6 +25,10 @@ Changes in version 0.2.8.7 - 2016-08-2?
       directory information. Fixes bug 19947; bugfix on 0.2.4.7-alpha
       and 0.2.8.1-alpha. Report and patch by "rubiate".
 
+  o Directory authority changes:
+    - The "Tonga" bridge authority has been retired; the new bridge
+      authority is "Bifroest". Closes tickets 19728 and 19690.
+
 
 Changes in version 0.2.8.6 - 2016-08-02
 
diff --git a/changes/bug19728 b/changes/bug19728
deleted file mode 100644
index 98ba342..0000000
--- a/changes/bug19728
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Directory authority changes:
-    - The "Tonga" bridge authority has been retired; the new bridge
-      authority is "Bifroest". Closes tickets 19728 and 19690.
diff --git a/changes/bug19973 b/changes/bug19973
deleted file mode 100644
index 7bd5c55..0000000
--- a/changes/bug19973
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (client, security):
-    - Only use the ReachableAddresses option to restrict the first hop
-      in a path. Previously, it would apply to every hop in the path,
-      with a possible degredation in anonymity for anyone using an
-      uncommon ReachableAddress setting. Fixes bug 19973; bugfix on
-      0.2.8.2-alpha.