[tor-commits] [tor/release-0.2.8] Fold another entry into the changelog

[nickm at torproject.org]

commit 9baf4d10b4656139e18c178f5c669ef0cd70c057
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 6 10:20:57 2016 -0400

    Fold another entry into the changelog
---
 ChangeLog        | 7 +++++++
 changes/bug19608 | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1e7257..f204bbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,13 @@ Changes in version 0.2.8.5-rc - 2016-07-0?
       fallbacks. Fixes bug 19480; bugfix on 0.2.8.3-alpha. Patch
       by teor.
 
+  o Minor bugfixes (IPv6, microdescriptors):
+    - Don't check node addresses when we only have a routerstatus. This
+      allows IPv6-only clients to bootstrap by fetching microdescriptors
+      from fallback directory mirrors. (The microdescriptor consensus
+      has no IPv6 addresses in it.) Fixes bug 19608; bugfix
+      on 0.2.8.2-alpha.
+
   o Minor bugfixes (logging):
     - Reduce excessive logging when directory servers can't be found.
       Fixes bug 18849; bugfix on 0.2.8.3-alpha and 0.2.8.1-alpha. Patch
diff --git a/changes/bug19608 b/changes/bug19608
deleted file mode 100644
index 66c2de2..0000000
--- a/changes/bug19608
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (IPv6, microdescriptors):
-    - Don't check node addresses when we only have a routerstatus.
-      This allows IPv6-only clients to bootstrap by fetching
-      microdescriptors from fallback directory mirrors.
-      (The microdescriptor consensus has no IPv6 addresses in it.)
-      Fixes bug 19608; bugfix on c281c036 in 0.2.8.2-alpha.