commit 86aa7f0a3f26a02e240e64f844b8072dbe424379 parent 60dfdd9b154ed694a1eee202393b5eb6f664c03d Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 17 Jan 2018 10:50:58 -0500 Merge branch '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 @@ -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 * 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);