[tor-commits] [tor/release-0.3.0] Fold in changelog of bug 21415

[nickm at torproject.org]

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

    Fold in changelog of bug 21415
---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2115352..f78311f 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