aboutsummaryrefslogtreecommitdiff
path: root/src/or/hibernate.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-10-28 09:53:23 -0400
committerNick Mathewson <nickm@torproject.org>2011-10-28 09:53:23 -0400
commita2517fa77c066e34d58fd50f930529b84e30946e (patch)
tree63e48d33b48a052824074bb74d6340ee9b43fc23 /src/or/hibernate.c
parentba91272dedf9bacd7e7ef176c8a549f3aa5da452 (diff)
parentf6b1dc2805ce23d4f7fddcf2714b13f718d20038 (diff)
downloadtor-a2517fa77c066e34d58fd50f930529b84e30946e.tar
tor-a2517fa77c066e34d58fd50f930529b84e30946e.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/hibernate.c')
-rw-r--r--src/or/hibernate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 6e4c9f22b..6fd2b4f19 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);