summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-10-28 11:19:16 +0200
committerNick Mathewson <nickm@torproject.org>2011-10-28 09:52:24 -0400
commitf6b1dc2805ce23d4f7fddcf2714b13f718d20038 (patch)
treef157ee6579fcc3d0e940e240e0490f4cbf83b788
parent48bafb47acc19c2bee54f0731a73b8b2fc980359 (diff)
downloadtor-f6b1dc2805ce23d4f7fddcf2714b13f718d20038.tar.gz
tor-f6b1dc2805ce23d4f7fddcf2714b13f718d20038.zip
Fix typo, spotted by tmpname0901. Thanks!
-rw-r--r--changes/bug43314
-rw-r--r--src/or/hibernate.c2
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 aebce4cc88..2f7170fa24 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -943,7 +943,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);