summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2016-09-05 15:12:48 +1000
committerNick Mathewson <nickm@torproject.org>2016-09-13 10:13:56 -0400
commit4d9d2553baa6856b1d85ec26baa1ac3d2c24832a (patch)
tree2685c11bcfc6a6b4cd4ba448d42e087881e97f2e /src/or/config.c
parentc43211fd6cbb82a8016fcc0f81b309c6172e93d2 (diff)
downloadtor-4d9d2553baa6856b1d85ec26baa1ac3d2c24832a.tar.gz
tor-4d9d2553baa6856b1d85ec26baa1ac3d2c24832a.zip
Fix a typo in the LearnCircuitBuildTimeout disabled log message
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c
index d56d9f6f9d..36b2062271 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3468,15 +3468,12 @@ options_validate(or_options_t *old_options, or_options_t *options,
int severity = LOG_NOTICE;
/* Be a little quieter if we've deliberately disabled
* LearnCircuitBuildTimeout. */
- if (options->OnionServiceSingleHopMode) {
+ if (circuit_build_times_disabled()) {
severity = LOG_INFO;
-#ifdef ENABLE_TOR2WEB_MODE
- } else if (options->Tor2webMode) {
- severity = LOG_INFO;
-#endif
}
log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but "
- "didn't a CircuitBuildTimeout. I'll pick a plausible default.");
+ "didn't specify a CircuitBuildTimeout. I'll pick a plausible "
+ "default.");
}
if (options->PathBiasNoticeRate > 1.0) {