aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2014-07-28 02:47:43 -0400
committerRoger Dingledine <arma@torproject.org>2014-07-28 02:47:43 -0400
commit6c4a26b8ca3d8f61f55ad63baea2090e44fbc126 (patch)
tree83d14eff564483779dce69244f8a64891cca39e4 /changes
parent3f39c0e63e5b5460ea52b6a217aa4cc658d7a425 (diff)
parent29a82b5a8b6d5e75a1f8b880933c2a232458d386 (diff)
downloadtor-6c4a26b8ca3d8f61f55ad63baea2090e44fbc126.tar.gz
tor-6c4a26b8ca3d8f61f55ad63baea2090e44fbc126.zip
Merge branch 'maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug1038-36
-rw-r--r--changes/bug127185
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.