[tor-commits] [tor/release-0.2.8] Fold new changelog items in

[nickm at torproject.org]

commit 2b8ba551d3eab2793214ab34a1c9a47a888402cd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 19 08:56:06 2016 -0400

    Fold new changelog items in
---
 ChangeLog        | 26 ++++++++++++++++++++++++--
 changes/bug17150 |  7 -------
 changes/bug18809 | 16 ----------------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd190d0..c2c2821 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Changes in version 0.2.8.3-alpha - 2016-05-??
-  Tor 0.2.8.3-alpha resolves several bugs, most of them introduced over the
-  course of the 0.2.8 development cycle. It improves the behavior of
+  Tor 0.2.8.3-alpha resolves several bugs, most of them introduced over
+  the course of the 0.2.8 development cycle. It improves the behavior of
   directory clients, fixes several crash bugs, fixes a gap in compiler
   hardening, and allows the full integration test suite to run on
   more platforms.
@@ -23,6 +23,21 @@ Changes in version 0.2.8.3-alpha - 2016-05-??
       the list of relays includes duplicate ed25519 identity keys. Fixes
       bug 19032; bugfix on 0.2.8.2-alpha.
 
+  o Major bugfixes (client, bootstrapping):
+    - Check if bootstrap consensus downloads are still needed when the
+      linked connection attaches. This prevents tor making unnecessary
+      begindir-style connections, which are the only directory
+      connections tor clients make since the fix for 18483 was merged.
+    - Fix some edge cases where consensus download connections may not
+      have been closed, even though they were not needed. Related to fix
+      for 18809.
+    - Make relays retry consensus downloads the correct number of times,
+      rather than the more aggressive client retry count. Fixes part of
+      ticket 18809.
+    - Stop downloading consensuses when we have a consensus, even if we
+      don't have all the certificates for it yet. Fixes bug 18809;
+      bugfix on 0.2.8.1-alpha. Patches by arma and teor.
+
   o Major bugfixes (directory mirrors):
     - Decide whether to advertise begindir support in the the same way
       we decide whether to advertise our DirPort. Allowing these
@@ -98,6 +113,13 @@ Changes in version 0.2.8.3-alpha - 2016-05-??
       branch (tested against 1.1.0-pre4 and 1.1.0-pre5-dev). Closes
       ticket 18286.
 
+  o Minor bugfixes (directories):
+    - When fetching extrainfo documents, compare their SHA256 digests
+      and Ed25519 signing key certificates with the routerinfo that led
+      us to fetch them, rather than with the most recent routerinfo.
+      Otherwise we generate many spurious warnings about mismatches.
+      Fixes bug 17150; bugfix on 0.2.7.2-alpha.
+
   o Minor bugfixes (logging):
     - When we can't generate a signing key because OfflineMasterKey is
       set, do not imply that we should have been able to load it. Fixes
diff --git a/changes/bug17150 b/changes/bug17150
deleted file mode 100644
index 686cc34..0000000
--- a/changes/bug17150
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (directory warnings):
-    - When fetching extrainfo documents, compare their SHA256 digests
-      and Ed25519 signing key certificates
-      with the routerinfo that led us to fetch them, rather than
-      with the most recent routerinfo. Otherwise we generate many
-      spurious warnings about mismatches. Fixes bug 17150; bugfix
-      on 0.2.7.2-alpha.
diff --git a/changes/bug18809 b/changes/bug18809
deleted file mode 100644
index 1e15187..0000000
--- a/changes/bug18809
+++ /dev/null
@@ -1,16 +0,0 @@
-  o Major bugfixes (bootstrap):
-    - Check if bootstrap consensus downloads are still needed
-      when the linked connection attaches. This prevents tor
-      making unnecessary begindir-style connections, which are
-      the only directory connections tor clients make since
-      the fix for 18483 was merged.
-    - Fix some edge cases where consensus download connections
-      may not have been closed, even though they were not needed.
-      Related to fix  18809.
-    - Make relays retry consensus downloads the correct number of
-      times, rather than the more aggressive client retry count.
-      Fixes part of ticket 18809.
-    - Stop downloading consensuses when we have a consensus,
-      even if we don't have all the certificates for it yet.
-      Fixes bug 18809; bugfix on 0.2.8.1-alpha.
-      Patches by arma and teor.