aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-09-05 17:23:08 -0400
committerRoger Dingledine <arma@torproject.org>2012-09-05 17:23:08 -0400
commit325f33047a72050cbe3c35a5dc2ca156d012c996 (patch)
tree4f81f9965e011d6e6354dd0d1b2a3dcf473f45a8 /ChangeLog
parent6f82ae44cb85e61a729ccb7ce47451dae97e8602 (diff)
downloadtor-325f33047a72050cbe3c35a5dc2ca156d012c996.tar
tor-325f33047a72050cbe3c35a5dc2ca156d012c996.tar.gz
and fold it into master too
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ab0fd256e..12b7fff08 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