diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-04-15 14:51:19 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-04-15 14:51:19 -0400 |
commit | f3c20a28ab50386064043cc31edb3b1b543d6fc6 (patch) | |
tree | 64773ca132f9582a9bb358057f66b2e01e2abb24 /changes | |
parent | 149931571a4c5ad9ec24eb6d4306e8965a454211 (diff) | |
parent | b0e1ddbd98038e3c7326970887c74f169701cf35 (diff) | |
download | tor-f3c20a28ab50386064043cc31edb3b1b543d6fc6.tar.gz tor-f3c20a28ab50386064043cc31edb3b1b543d6fc6.zip |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/circuituse.c
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug11519 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/bug11519 b/changes/bug11519 new file mode 100644 index 0000000000..5c1e6af7e4 --- /dev/null +++ b/changes/bug11519 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Avoid sending an garbage value to the controller when a circuit is + cannibalized. Fixes bug 11519; bugfix on 0.2.3.11-alpha. |