diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-20 10:34:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-20 10:34:31 -0400 |
| commit | 80c987fbb41fb7299cf4fe8b04d6190c581bd158 (patch) | |
| tree | 4c928d4b94fca456c0d9598e7af8cf82484ce5eb /src/or/config.c | |
| parent | 96d39fd236d3e4f72b164ddcf7735cf833bef749 (diff) | |
| parent | 5b0b51ca3ff55d6e82081adf4cb1dbfa24ac4872 (diff) | |
| download | tor-80c987fbb41fb7299cf4fe8b04d6190c581bd158.tar tor-80c987fbb41fb7299cf4fe8b04d6190c581bd158.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index 86f066114..f03f3802f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2724,15 +2724,19 @@ options_validate(or_options_t *old_options, or_options_t *options, "http://freehaven.net/anonbib/#hs-attack06 for details."); } - if (!(options->LearnCircuitBuildTimeout) && - options->CircuitBuildTimeout < RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT) { + if (!options->LearnCircuitBuildTimeout && options->CircuitBuildTimeout && + options->CircuitBuildTimeout < RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT) { log_warn(LD_CONFIG, - "CircuitBuildTimeout is shorter (%d seconds) than recommended " - "(%d seconds), and LearnCircuitBuildTimeout is disabled. " + "CircuitBuildTimeout is shorter (%d seconds) than the recommended " + "minimum (%d seconds), and LearnCircuitBuildTimeout is disabled. " "If tor isn't working, raise this value or enable " "LearnCircuitBuildTimeout.", options->CircuitBuildTimeout, RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT ); + } else if (!options->LearnCircuitBuildTimeout && + !options->CircuitBuildTimeout) { + log_notice(LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but didn't " + "a CircuitBuildTimeout. I'll pick a plausible default."); } if (options->PathBiasNoticeRate > 1.0) { |