summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-03-11 04:30:22 +0000
committerNick Mathewson <nickm@torproject.org>2008-03-11 04:30:22 +0000
commit5c6d0919ba41a37adc67ffdcea5a70a001347147 (patch)
tree4321482bd620b7870172cdfbd7693bb9a86e9829
parentd8651d1072adc4fb20e6bd0edcd5f9f06ec74a9a (diff)
downloadtor-5c6d0919ba41a37adc67ffdcea5a70a001347147.tar.gz
tor-5c6d0919ba41a37adc67ffdcea5a70a001347147.zip
r18725@catbus: nickm | 2008-03-11 00:29:57 -0400
Backport to 0.2.0.x branch: Fix bug spotted by mwenge: a server_event should not be a sever_event. Not backporting to 0.1.2.x. svn:r13958
-rw-r--r--ChangeLog2
-rw-r--r--src/or/control.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 91f2d64eec..e80d89b61b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@ Changes in version 0.2.0.21-rc - 2008-03-02
- We were sometimes miscounting the number of bytes read from the
network, causing our rate limiting to not be followed exactly.
Bugfix on 0.2.0.16-alpha. Reported by lodger.
+ - Generate "STATUS_SERVER" events rather than misspelled "STATUS_SEVER"
+ events. Caught by mwenge; bugfix on 0.1.2.x.
o Minor bugfixes:
- Fix compilation with OpenSSL 0.9.8 and 0.9.8a. All other supported
diff --git a/src/or/control.c b/src/or/control.c
index 3cc9c5fe2f..1327a1fc6a 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3581,7 +3581,7 @@ control_event_status(int type, int severity, const char *format, va_list args)
status = "STATUS_CLIENT";
break;
case EVENT_STATUS_SERVER:
- status = "STATUS_SEVER";
+ status = "STATUS_SERVER";
break;
default:
log_warn(LD_BUG, "Unrecognized status type %d", type);