summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-09-24 22:47:53 -0400
committerRoger Dingledine <arma@torproject.org>2011-09-24 22:47:53 -0400
commit88516f65c9753d6ec60dd7cb0c28c3ff91fdb101 (patch)
treecc3add7bf31f6505a5988ac61f8cb246864f004e /src/or/circuitbuild.c
parent5a8dcca8f7f8637792d63a9aec1408da26c7cbe6 (diff)
parent1c2e4d13366aee5f0107696e4d621b924a6f39a6 (diff)
downloadtor-88516f65c9753d6ec60dd7cb0c28c3ff91fdb101.tar.gz
tor-88516f65c9753d6ec60dd7cb0c28c3ff91fdb101.zip
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 7a8a867254..902931575b 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1408,7 +1408,7 @@ circuit_build_times_set_timeout_worker(circuit_build_times_t *cbt)
cbt->close_ms = MAX(cbt->close_ms, circuit_build_times_initial_timeout());
if (cbt->timeout_ms > max_time) {
- log_notice(LD_CIRC,
+ log_info(LD_CIRC,
"Circuit build timeout of %dms is beyond the maximum build "
"time we have ever observed. Capping it to %dms.",
(int)cbt->timeout_ms, max_time);
@@ -1456,7 +1456,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt)
timeout_rate = circuit_build_times_timeout_rate(cbt);
if (prev_timeout > tor_lround(cbt->timeout_ms/1000)) {
- log_notice(LD_CIRC,
+ log_info(LD_CIRC,
"Based on %d circuit times, it looks like we don't need to "
"wait so long for circuits to finish. We will now assume a "
"circuit is too slow to use after waiting %ld seconds.",
@@ -1467,7 +1467,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt)
cbt->timeout_ms, cbt->close_ms, cbt->Xm, cbt->alpha,
timeout_rate);
} else if (prev_timeout < tor_lround(cbt->timeout_ms/1000)) {
- log_notice(LD_CIRC,
+ log_info(LD_CIRC,
"Based on %d circuit times, it looks like we need to wait "
"longer for circuits to finish. We will now assume a "
"circuit is too slow to use after waiting %ld seconds.",