diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-27 16:39:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-27 16:39:30 -0400 |
| commit | 3363a0d26e553378084415b1bcc67c36929d9c07 (patch) | |
| tree | a58756787312f9e3b72efb921eec690ead80cdfb | |
| parent | f40378118c711da6bf6d3ee2f247189306abad22 (diff) | |
| parent | a7a4bbff47c92aa4df0a932492867d1601834118 (diff) | |
| download | tor-3363a0d26e553378084415b1bcc67c36929d9c07.tar.gz tor-3363a0d26e553378084415b1bcc67c36929d9c07.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
| -rw-r--r-- | changes/bug6251 | 6 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug6251 b/changes/bug6251 new file mode 100644 index 0000000000..c782a93e49 --- /dev/null +++ b/changes/bug6251 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Downgrade "set buildtimeout to low value" messages to INFO + severity; they were never an actual problem, there was never + anything reasonable to do about them, and they tended to spam + logs from time to time. Fix for bug 6251; bugfix on + 0.2.2.2-alpha.
\ No newline at end of file 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) { |