summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-06-15 09:57:18 -0400
committerNick Mathewson <nickm@torproject.org>2012-06-15 09:57:18 -0400
commit8030ec4f272d470b9d01b7095f17252aaca163c2 (patch)
tree52a411d340f9f8985648d77881ae8b715f7ae2e0
parenta7efedc3220d9ae7cf0e631d9e2fd7da23d75629 (diff)
downloadtor-8030ec4f272d470b9d01b7095f17252aaca163c2.tar.gz
tor-8030ec4f272d470b9d01b7095f17252aaca163c2.zip
Downgrade log messages about cbt enabled/disabled. Bug 6169.
-rw-r--r--changes/bug61694
-rw-r--r--src/or/circuitbuild.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug6169 b/changes/bug6169
new file mode 100644
index 0000000000..9880fc94d8
--- /dev/null
+++ b/changes/bug6169
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Remove a non-bug log messages about running with circuit timeout
+ learning enabled from LD_BUG. Fixes bug 6169; bugfix on
+ 0.2.3.17-beta.
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 65fcaf4089..149383eed9 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -158,14 +158,14 @@ circuit_build_times_disabled(void)
if (consensus_disabled || config_disabled || dirauth_disabled ||
state_disabled) {
- log_info(LD_CIRC,
+ log_debug(LD_CIRC,
"CircuitBuildTime learning is disabled. "
"Consensus=%d, Config=%d, AuthDir=%d, StateFile=%d",
consensus_disabled, config_disabled, dirauth_disabled,
state_disabled);
return 1;
} else {
- log_debug(LD_BUG,
+ log_debug(LD_CIRC,
"CircuitBuildTime learning is not disabled. "
"Consensus=%d, Config=%d, AuthDir=%d, StateFile=%d",
consensus_disabled, config_disabled, dirauth_disabled,