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

Use CircuitBuildTimeout whenever circuit_build_times_disabled is true

Browse Source 
Previously, we checked LearnCircuitBuildTimeout directly.

Fixes bug #20073 in commit 5b0b51ca3 on tor 0.2.4.12-alpha.
This commit is contained in:
teor 2016-09-06 15:58:30 +10:00 committed by Nick Mathewson
parent 3e4a401ead
commit 0285f4f34d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/feature17178
View File

@ -18,3 +18,6 @@
- Prevent Tor2web clients running hidden services, these services are - Prevent Tor2web clients running hidden services, these services are
not anonymous due to the one-hop client paths. not anonymous due to the one-hop client paths.
Fixes bug #19678. Patch by teor. 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.

2
src/or/circuitstats.c
View File

@ -489,7 +489,7 @@ circuit_build_times_get_initial_timeout(void)
*/ */
if (!unit_tests && get_options()->CircuitBuildTimeout) { if (!unit_tests && get_options()->CircuitBuildTimeout) {
timeout = get_options()->CircuitBuildTimeout*1000; timeout = get_options()->CircuitBuildTimeout*1000;
if (get_options()->LearnCircuitBuildTimeout && if (!circuit_build_times_disabled() &&
timeout < circuit_build_times_min_timeout()) { timeout < circuit_build_times_min_timeout()) {
log_warn(LD_CIRC, "Config CircuitBuildTimeout too low. Setting to %ds", log_warn(LD_CIRC, "Config CircuitBuildTimeout too low. Setting to %ds",
circuit_build_times_min_timeout()/1000); circuit_build_times_min_timeout()/1000);