summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-03-01 09:08:52 -0500
committerNick Mathewson <nickm@torproject.org>2017-03-01 09:08:52 -0500
commitd1054b09b9fd3778cf26a6fb4eeca8287a415eb5 (patch)
treee3ee7ae104c344a613e6d4f85634c421c47ce301
parentf0dab06fca70da04d2b2aa300f2e093a2fc7130e (diff)
downloadtor-d1054b09b9fd3778cf26a6fb4eeca8287a415eb5.tar.gz
tor-d1054b09b9fd3778cf26a6fb4eeca8287a415eb5.zip
Fold in changelog of bug 21415
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2115352d4a..f78311f57e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,9 @@ Changes in version 0.3.0.4-rc - 2017-03-??
- Don't warn about a missing guard state on timeout-measurement
circuits: they aren't supposed to be using guards. Fixes an
instance of bug 21007; bugfix on 0.3.0.1-alpha.
+ - Silence a BUG() warning when attempting to use a guard whose descriptor
+ we don't know, and make this scenario less likely to happen. Fixes bug
+ 21415; bugfix on 0.3.0.1-alpha.
o Minor bugfixes (hidden service):
- Pass correct buffer length when encoding legacy ESTABLISH_INTRO