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

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

Browse Source
This commit is contained in:
Nick Mathewson 2011-10-28 09:53:23 -04:00
commit a2517fa77c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug4331 Normal file
View File

@ -0,0 +1,4 @@
o Trivial fixes:
- Fixed a typo in a hibernation-related log message. Fixes bug 4331;
bugfix on 0.2.2.23-alpha; found by "tmpname0901".

2
src/or/hibernate.c
View File

@ -932,7 +932,7 @@ consider_hibernation(time_t now)
if (hibernate_soft_limit_reached()) { if (hibernate_soft_limit_reached()) {
log_notice(LD_ACCT, log_notice(LD_ACCT,
"Bandwidth soft limit reached; commencing hibernation. " "Bandwidth soft limit reached; commencing hibernation. "
"No new conncetions will be accepted"); "No new connections will be accepted");
hibernate_begin(HIBERNATE_STATE_LOWBANDWIDTH, now); hibernate_begin(HIBERNATE_STATE_LOWBANDWIDTH, now);
} else if (accounting_enabled && now < interval_wakeup_time) { } else if (accounting_enabled && now < interval_wakeup_time) {
format_local_iso_time(buf,interval_wakeup_time); format_local_iso_time(buf,interval_wakeup_time);