summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-12-03 22:06:50 -0800
committerRobert Ransom <rransom.8774@gmail.com>2011-12-03 22:06:50 -0800
commitf5730d469805eab1dbcc1cafa4a6433913f1d0a8 (patch)
treef95091d8bcc3e52448021d171afe1757c9d20049
parent682a85ff7c691f691f9f7745e34e396f15e5d601 (diff)
downloadtor-f5730d469805eab1dbcc1cafa4a6433913f1d0a8.tar.gz
tor-f5730d469805eab1dbcc1cafa4a6433913f1d0a8.zip
Don't send two ESTABLISH_RENDEZVOUS cells when opening a new rend circ
-rw-r--r--changes/bug46417
-rw-r--r--src/or/circuituse.c1
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug4641 b/changes/bug4641
new file mode 100644
index 0000000000..699cb9bc36
--- /dev/null
+++ b/changes/bug4641
@@ -0,0 +1,7 @@
+ o Minor bugfixes:
+
+ - Don't send two ESTABLISH_RENDEZVOUS cells when opening a new
+ circuit for use as a hidden service client's rendezvous point.
+ Fixes bugs 4641 and 4171; bugfix on 0.2.3.3-alpha. Diagnosed
+ with help from wanoskarnet.
+
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index fbcfe24450..0bc416d0a9 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1017,7 +1017,6 @@ circuit_has_opened(origin_circuit_t *circ)
switch (TO_CIRCUIT(circ)->purpose) {
case CIRCUIT_PURPOSE_C_ESTABLISH_REND:
rend_client_rendcirc_has_opened(circ);
- can_try_clearing_isolation = 1;
connection_ap_attach_pending();
break;
case CIRCUIT_PURPOSE_C_INTRODUCING: