summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-02 09:04:20 -0400
committerNick Mathewson <nickm@torproject.org>2018-11-02 09:04:20 -0400
commite847909b71333690d3fb9a31a738ea3c1ab6d1e1 (patch)
treee86a0bda2a6a4f6b5621e094021e64e8796a4085
parentbcc1a7180870368b69d51706226c2f667c482506 (diff)
parentfa6d5dd2686d9fedfbbea9bdf0d7dab1a7afc7c4 (diff)
downloadtor-e847909b71333690d3fb9a31a738ea3c1ab6d1e1.tar.gz
tor-e847909b71333690d3fb9a31a738ea3c1ab6d1e1.zip
Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3
-rw-r--r--changes/ticket274105
-rw-r--r--src/or/hs_client.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/ticket27410 b/changes/ticket27410
new file mode 100644
index 0000000000..a21fdde58e
--- /dev/null
+++ b/changes/ticket27410
@@ -0,0 +1,5 @@
+ o Minor bugfixes (hidden service v3):
+ - Close all SOCKS request (for the same .onion) if the newly fetched
+ descriptor is unusable. Before that, we would close only the first one
+ leaving the other hanging and let to time out by themselves. Fixes bug
+ 27410; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/hs_client.c b/src/or/hs_client.c
index 636226a1d5..0cfdec1907 100644
--- a/src/or/hs_client.c
+++ b/src/or/hs_client.c
@@ -1429,7 +1429,7 @@ hs_client_desc_has_arrived(const hs_ident_dir_conn_t *ident)
/* We are unable to use the descriptor so remove the directory request
* from the cache so the next connection can try again. */
note_connection_attempt_succeeded(edge_conn->hs_ident);
- goto end;
+ continue;
}
log_info(LD_REND, "Descriptor has arrived. Launching circuits.");