diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-02 09:04:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-02 09:04:25 -0400 |
| commit | 8ed4f1ee8418eaafcb6314f093d1186d711a837e (patch) | |
| tree | 256f8dd887674684bb9941d282eeba6701953d58 | |
| parent | 158db532eb6423a87434599ff0a0c5fb46208e69 (diff) | |
| parent | e847909b71333690d3fb9a31a738ea3c1ab6d1e1 (diff) | |
| download | tor-8ed4f1ee8418eaafcb6314f093d1186d711a837e.tar.gz tor-8ed4f1ee8418eaafcb6314f093d1186d711a837e.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
| -rw-r--r-- | changes/ticket27410 | 5 | ||||
| -rw-r--r-- | src/or/hs_client.c | 2 |
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 b39bb2cad0..5546746202 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."); |