diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-09-05 17:22:23 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-09-05 17:22:23 -0400 |
| commit | 139a81c96d4af2f52b1f3d76adc4079403c8d2d7 (patch) | |
| tree | d82d2cfe7fa895c8ada6068d172c004252208733 | |
| parent | 59deac92a1b9bea4c1340c7aa533e3105c7df266 (diff) | |
| download | tor-139a81c96d4af2f52b1f3d76adc4079403c8d2d7.tar.gz tor-139a81c96d4af2f52b1f3d76adc4079403c8d2d7.zip | |
fold in last changes filetor-0.2.3.21-rc
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | changes/bug6774 | 4 |
2 files changed, 2 insertions, 4 deletions
@@ -62,6 +62,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. Fixes 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 0c137fd678..0000000000 --- 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. - |