nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 22:53:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.2'

Browse Source
This commit is contained in:
Nick Mathewson 2018-01-17 10:50:58 -05:00
commit 86aa7f0a3f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug24894 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes (v3 onion services):
- New-style (v3) onion services now obey the "max rendezvous circuit
attempts" logic. Previously they would make as many rendezvous
circuit attempts as they could fit in the MAX_REND_TIMEOUT second
window before giving up. Fixes bug 24894; bugfix on 0.3.2.1-alpha.

2
src/or/hs_circuit.c
View File

@ -546,7 +546,7 @@ retry_service_rendezvous_point(const origin_circuit_t *circ)
/* Transfer build state information to the new circuit state in part to /* Transfer build state information to the new circuit state in part to
* catch any other failures. */ * catch any other failures. */
new_circ->build_state->failure_count = bstate->failure_count++; new_circ->build_state->failure_count = bstate->failure_count+1;
new_circ->build_state->expiry_time = bstate->expiry_time; new_circ->build_state->expiry_time = bstate->expiry_time;
new_circ->hs_ident = hs_ident_circuit_dup(circ->hs_ident); new_circ->hs_ident = hs_ident_circuit_dup(circ->hs_ident);