aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-03-01 09:08:04 -0500
committerNick Mathewson <nickm@torproject.org>2017-03-01 09:08:04 -0500
commitf0dab06fca70da04d2b2aa300f2e093a2fc7130e (patch)
tree0709c80393ef3dd9e227f6a217ff7129c2f6fbe1
parent18a4a4d7fd636de11547bba2d6005f36378058de (diff)
downloadtor-f0dab06fca70da04d2b2aa300f2e093a2fc7130e.tar.gz
tor-f0dab06fca70da04d2b2aa300f2e093a2fc7130e.zip
Make it clear that we fixed 2 cases of 20711
-rw-r--r--ChangeLog4
-rw-r--r--changes/bug214154
2 files changed, 2 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d91e96d612..2115352d4a 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 f0aa72f81f..0000000000
--- 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.