diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-28 09:53:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-28 09:53:23 -0400 |
| commit | a2517fa77c066e34d58fd50f930529b84e30946e (patch) | |
| tree | 63e48d33b48a052824074bb74d6340ee9b43fc23 | |
| parent | ba91272dedf9bacd7e7ef176c8a549f3aa5da452 (diff) | |
| parent | f6b1dc2805ce23d4f7fddcf2714b13f718d20038 (diff) | |
| download | tor-a2517fa77c066e34d58fd50f930529b84e30946e.tar.gz tor-a2517fa77c066e34d58fd50f930529b84e30946e.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug4331 | 4 | ||||
| -rw-r--r-- | src/or/hibernate.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug4331 b/changes/bug4331 new file mode 100644 index 0000000000..011238a962 --- /dev/null +++ b/changes/bug4331 @@ -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". + diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 6e4c9f22b8..6fd2b4f197 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -932,7 +932,7 @@ consider_hibernation(time_t now) if (hibernate_soft_limit_reached()) { log_notice(LD_ACCT, "Bandwidth soft limit reached; commencing hibernation. " - "No new conncetions will be accepted"); + "No new connections will be accepted"); hibernate_begin(HIBERNATE_STATE_LOWBANDWIDTH, now); } else if (accounting_enabled && now < interval_wakeup_time) { format_local_iso_time(buf,interval_wakeup_time); |