aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-08-27 16:39:30 -0400
committerNick Mathewson <nickm@torproject.org>2012-08-27 16:39:30 -0400
commit3363a0d26e553378084415b1bcc67c36929d9c07 (patch)
treea58756787312f9e3b72efb921eec690ead80cdfb /src/or/circuitbuild.c
parentf40378118c711da6bf6d3ee2f247189306abad22 (diff)
parenta7a4bbff47c92aa4df0a932492867d1601834118 (diff)
downloadtor-3363a0d26e553378084415b1bcc67c36929d9c07.tar.gz
tor-3363a0d26e553378084415b1bcc67c36929d9c07.zip
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index c33621926e..ba617ffa45 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1627,7 +1627,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt)
return;
if (cbt->timeout_ms < circuit_build_times_min_timeout()) {
- log_warn(LD_CIRC, "Set buildtimeout to low value %fms. Setting to %dms",
+ log_info(LD_CIRC, "Set buildtimeout to low value %fms. Setting to %dms",
cbt->timeout_ms, circuit_build_times_min_timeout());
cbt->timeout_ms = circuit_build_times_min_timeout();
if (cbt->close_ms < cbt->timeout_ms) {