commit 325f33047a72050cbe3c35a5dc2ca156d012c996 Author: Roger Dingledine arma@torproject.org Date: Wed Sep 5 17:23:08 2012 -0400

and fold it into master too --- ChangeLog | 2 ++ changes/bug6774 | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog index ab0fd25..12b7fff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,6 +178,8 @@ Changes in version 0.2.3.21-rc - 2012-09-05 when provided via the controller's MapAddress command. Previously, they were accepted, but we never actually noticed that they were wildcards. Fixes bug 6244; bugfix on 0.2.3.9-alpha. + - Avoid crashing on a malformed state file where EntryGuardPathBias + precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. - Add a (probably redundant) memory clear between iterations of the router status voting loop, to prevent future coding errors where data might leak between iterations of the loop. Resolves diff --git a/changes/bug6774 b/changes/bug6774 deleted file mode 100644 index 0c137fd..0000000 --- a/changes/bug6774 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Avoid crashing on a malformed state file where EntryGuardPathBias - precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. -