[tor-commits] [tor/release-0.3.0] Make it clear that we fixed 2 cases of 20711

[nickm at torproject.org]

commit f0dab06fca70da04d2b2aa300f2e093a2fc7130e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 1 09:08:04 2017 -0500

    Make it clear that we fixed 2 cases of 20711
---
 ChangeLog        | 4 ++--
 changes/bug21415 | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d91e96d..2115352 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,10 +74,10 @@ Changes in version 0.3.0.4-rc - 2017-03-??
   o Minor bugfixes (directory mirrors):
     - Allow relays to use directory mirrors without a DirPort: these
       relays need to be contacted over their ORPorts using a begindir
-      connection. Fixes bug 20711; bugfix on 0.2.8.2-alpha.
+      connection. Fixes one case of bug 20711; bugfix on 0.2.8.2-alpha.
     - Clarify the message logged when a remote relay is unexpectedly
       missing an ORPort or DirPort: users were confusing this with a
-      local port. Fixes bug 20711; bugfix on 0.2.8.2-alpha.
+      local port. Fixes another case of bug 20711; bugfix on 0.2.8.2-alpha.
 
   o Minor bugfixes (guards):
     - Don't warn about a missing guard state on timeout-measurement
diff --git a/changes/bug21415 b/changes/bug21415
deleted file mode 100644
index f0aa72f..0000000
--- a/changes/bug21415
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfix (entry guards):
-    - Silence a BUG() warning when attempting to use a guard whose descriptor
-      we don't know and make this scenario more unlikely to happen. Fixes bug
-      21415; bugfix on 0.3.0.1-alpha.