diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-04 13:50:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-04 13:50:24 -0500 |
| commit | 65420e4cb5edcd02b6f44462dcc5c3a7fa8bb2e9 (patch) | |
| tree | 86e7a09ba27884359051963eb4097cc3a353413a /changes | |
| parent | 47b7a279298c81137430527ed0a72c6a6d3fcd61 (diff) | |
| parent | 0bd53b8d87a5fd4691530b8cb54181037062b949 (diff) | |
| download | tor-65420e4cb5edcd02b6f44462dcc5c3a7fa8bb2e9.tar.gz tor-65420e4cb5edcd02b6f44462dcc5c3a7fa8bb2e9.zip | |
Merge remote-tracking branch 'rransom-tor/bug1297b-v2'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug1297b | 20 | ||||
| -rw-r--r-- | changes/bug4759 | 14 |
2 files changed, 34 insertions, 0 deletions
diff --git a/changes/bug1297b b/changes/bug1297b new file mode 100644 index 0000000000..fb0d00cabf --- /dev/null +++ b/changes/bug1297b @@ -0,0 +1,20 @@ + o Minor bugfixes: + + - Don't close hidden service client circuits which have almost + finished connecting to their destination when they reach the + normal circuit-build timeout. Previously, we would close + introduction circuits which are waiting for an acknowledgement + from the introduction-point relay and rendezvous circuits which + have been specified in an INTRODUCE1 cell sent to a hidden + service after the normal CBT; now, we mark them as 'timed out', + and launch another rendezvous attempt in parallel. This + behaviour change can be disabled using the new + CloseHSClientCircuitsImmediatelyOnTimeout option. Fixes part of + bug 1297. + + - Don't close hidden-service-side rendezvous circuits when they + reach the normal circuit-build timeout. Previously, we would + close them. This behaviour change can be disabled using the new + CloseHSServiceRendCircuitsImmediatelyOnTimeout option. Fixes + the remaining part of bug 1297. + diff --git a/changes/bug4759 b/changes/bug4759 new file mode 100644 index 0000000000..19138ab8b2 --- /dev/null +++ b/changes/bug4759 @@ -0,0 +1,14 @@ + o Minor bugfixes: + + - Make sure we never mark the wrong rendezvous circuit as having + had its introduction cell acknowleged by the introduction-point + relay. Previously, when we received an INTRODUCE_ACK cell on a + client-side hidden-service introduction circuit, we might have + marked a rendezvous circuit other than the one we specified in + the INTRODUCE1 cell as INTRO_ACKED, which would have produced a + warning message and interfered with the hidden service + connection-establishment process. Bugfix on 0.2.3.3-alpha, when + the stream-isolation feature which might cause Tor to open + multiple rendezvous circuits for the same hidden service was + added. Fixes bug 4759. + |