mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 18:22:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.6'

Browse Source
This commit is contained in:
Nick Mathewson 2015-06-25 11:14:53 -04:00
commit bd73168307
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug16013 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes (hidden service, stability):
- Stop randomly crashing with an assertion failure when connecting to a
busy hidden service, or connecting to a hidden service while a NEWNYM
is in progress. Fixes bug 16013; bugfix on 0.1.0.1-rc.

12
src/or/circuituse.c
View File

@ -2423,6 +2423,18 @@ connection_ap_handshake_attach_circuit(entry_connection_t *conn)
return 1;
}
/* At this point we need to re-check the state, since it's possible that
* our call to circuit_get_open_circ_or_launch() changed the connection's
* state from "CIRCUIT_WAIT" to "RENDDESC_WAIT" because we decided to
* re-fetch the descriptor.
*/
if (ENTRY_TO_CONN(conn)->state != AP_CONN_STATE_CIRCUIT_WAIT) {
log_info(LD_REND, "This connection is no longer ready to attach; its "
"state changed."
"(We probably have to re-fetch its descriptor.)");
return 0;
}
if (rendcirc && (rendcirc->base_.purpose ==
CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED)) {
log_info(LD_REND,