commit f02c6bcad08754e0946c1ae5199cfebc9e30fe7b parent 0cb89eb828005ccf4b1ae72988b9c3b958ceade4 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 17 Jan 2018 10:49:45 -0500 Merge remote-tracking branch 'arma/bug24894' into maint-0.3.2 Diffstat:
| A | changes/bug24894 | | | 5 | +++++ |
| M | src/or/hs_circuit.c | | | 2 | +- |
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug24894 b/changes/bug24894 @@ -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. diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c @@ -545,7 +545,7 @@ retry_service_rendezvous_point(const origin_circuit_t *circ) /* Transfer build state information to the new circuit state in part to * 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->hs_ident = hs_ident_circuit_dup(circ->hs_ident);