diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-17 10:49:45 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-17 10:49:45 -0500 |
| commit | f02c6bcad08754e0946c1ae5199cfebc9e30fe7b (patch) | |
| tree | 587ecdcc878a4bd1dcd0cac10daabd7259216ed7 | |
| parent | 0cb89eb828005ccf4b1ae72988b9c3b958ceade4 (diff) | |
| parent | 7ce335c9217f36b1aca6973d119630c7b846c1ce (diff) | |
| download | tor-f02c6bcad08754e0946c1ae5199cfebc9e30fe7b.tar.gz tor-f02c6bcad08754e0946c1ae5199cfebc9e30fe7b.zip | |
Merge remote-tracking branch 'arma/bug24894' into maint-0.3.2
| -rw-r--r-- | changes/bug24894 | 5 | ||||
| -rw-r--r-- | src/or/hs_circuit.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug24894 b/changes/bug24894 new file mode 100644 index 0000000000..b08cdce1f0 --- /dev/null +++ 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 index a58166ccde..11ce2a1887 100644 --- 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); |