diff options
author | Roger Dingledine <arma@torproject.org> | 2014-07-28 02:47:15 -0400 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2014-07-28 02:47:15 -0400 |
commit | 29a82b5a8b6d5e75a1f8b880933c2a232458d386 (patch) | |
tree | 4a5c99918cc77aca7a21696f6b62f8c00f567e4c /changes | |
parent | 2126feaabc3e07dc8f7ad712256de496fbcfb976 (diff) | |
parent | 68a2e4ca4baa595cc4595a511db11fa7ccbbc8f7 (diff) | |
download | tor-29a82b5a8b6d5e75a1f8b880933c2a232458d386.tar.gz tor-29a82b5a8b6d5e75a1f8b880933c2a232458d386.zip |
Merge branch 'maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug1038-3 | 6 | ||||
-rw-r--r-- | changes/bug12718 | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/changes/bug1038-3 b/changes/bug1038-3 new file mode 100644 index 0000000000..5af4afa46f --- /dev/null +++ b/changes/bug1038-3 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Warn and drop the circuit if we receive an inbound 'relay early' + cell. Those used to be normal to receive on hidden service circuits + due to bug 1038, but the buggy Tor versions are long gone from + the network so we can afford to resume watching for them. Resolves + the rest of bug 1038; bugfix on 0.2.1.19. diff --git a/changes/bug12718 b/changes/bug12718 new file mode 100644 index 0000000000..0c5f708446 --- /dev/null +++ b/changes/bug12718 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Correct a confusing error message when trying to extend a circuit + via the control protocol but we don't know a descriptor or + microdescriptor for one of the specified relays. Fixes bug 12718; + bugfix on 0.2.3.1-alpha. |