tor

commit e847909b71333690d3fb9a31a738ea3c1ab6d1e1
parent bcc1a7180870368b69d51706226c2f667c482506
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  2 Nov 2018 09:04:20 -0400

Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3

Diffstat:
A
changes/ticket27410
 | 
5
+++++
M
src/or/hs_client.c
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/ticket27410 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
@@ -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.");