Merge branch 'maint-0.3.3' into maint-0.3.4

This commit is contained in:
Nick Mathewson 2018-11-02 09:04:25 -04:00
commit 8ed4f1ee84
2 changed files with 6 additions and 1 deletions

5
changes/ticket27410 Normal file
View File

@ -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.

View File

@ -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 /* We are unable to use the descriptor so remove the directory request
* from the cache so the next connection can try again. */ * from the cache so the next connection can try again. */
note_connection_attempt_succeeded(edge_conn->hs_ident); note_connection_attempt_succeeded(edge_conn->hs_ident);
goto end; continue;
} }
log_info(LD_REND, "Descriptor has arrived. Launching circuits."); log_info(LD_REND, "Descriptor has arrived. Launching circuits.");