diff options
| author | teor <teor2345@gmail.com> | 2016-09-06 15:58:30 +1000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-13 10:13:56 -0400 |
| commit | 0285f4f34d72b2b77f36fd55fa46216f6b54efc4 (patch) | |
| tree | c4b24dd434bbdc3039794cc0a64253f9b2e721f3 | |
| parent | 3e4a401ead701750218146edde939ef74ce8a5d0 (diff) | |
| download | tor-0285f4f34d72b2b77f36fd55fa46216f6b54efc4.tar.gz tor-0285f4f34d72b2b77f36fd55fa46216f6b54efc4.zip | |
Use CircuitBuildTimeout whenever circuit_build_times_disabled is true
Previously, we checked LearnCircuitBuildTimeout directly.
Fixes bug #20073 in commit 5b0b51ca3 on tor 0.2.4.12-alpha.
| -rw-r--r-- | changes/feature17178 | 3 | ||||
| -rw-r--r-- | src/or/circuitstats.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/feature17178 b/changes/feature17178 index 2bd2049bc5..df6aae3ced 100644 --- a/changes/feature17178 +++ b/changes/feature17178 @@ -18,3 +18,6 @@ - Prevent Tor2web clients running hidden services, these services are not anonymous due to the one-hop client paths. Fixes bug #19678. Patch by teor. + o Minor bug fixes (circuits): + - Use CircuitBuildTimeout whenever LearnCircuitBuildTimeout is disabled. + Fixes bug #19678 in commit 5b0b51ca3 in 0.2.4.12-alpha. Patch by teor. diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index fe8860e9c9..296f852c79 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -489,7 +489,7 @@ circuit_build_times_get_initial_timeout(void) */ if (!unit_tests && get_options()->CircuitBuildTimeout) { timeout = get_options()->CircuitBuildTimeout*1000; - if (get_options()->LearnCircuitBuildTimeout && + if (!circuit_build_times_disabled() && timeout < circuit_build_times_min_timeout()) { log_warn(LD_CIRC, "Config CircuitBuildTimeout too low. Setting to %ds", circuit_build_times_min_timeout()/1000); |