nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source
This commit is contained in:
Nick Mathewson 2012-08-27 16:39:30 -04:00
commit 3363a0d26e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug6251 Normal file
View File

@ -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.

2
src/or/circuitbuild.c
View File

@ -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) {