diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-03-16 03:00:57 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-03-16 03:00:57 +0000 |
| commit | 574f234dc79edc9fb392b10ac6fdef0bd2d7ac91 (patch) | |
| tree | f243e147bc5929f9bc01a752de7fa2da4d04e4c1 /src | |
| parent | 9027b7acf9dd0529164c9724b6c5ea36ae626d13 (diff) | |
| download | tor-574f234dc79edc9fb392b10ac6fdef0bd2d7ac91.tar.gz tor-574f234dc79edc9fb392b10ac6fdef0bd2d7ac91.zip | |
backport r9817 and r9823, and bump to 0.1.2.11-rc.
svn:r9836
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/control.c | 5 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index bfe6281570..7b69b42ad4 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1142,7 +1142,10 @@ handle_control_setevents(control_connection_t *conn, uint32_t len, event_code = EVENT_STATUS_SERVER; else if (!strcasecmp(ev, "GUARD")) event_code = EVENT_GUARD; - else if (!strcasecmp(ev, "STREAM_BW")) + else if (!strcasecmp(ev, "GUARDS")) { + /* XXX tolerate buggy spec in 0.1.2.5-alpha through 0.1.2.10-rc */ + event_code = EVENT_GUARD; + } else if (!strcasecmp(ev, "STREAM_BW")) event_code = EVENT_STREAM_BANDWIDTH_USED; else { connection_printf_to_buf(conn, "552 Unrecognized event \"%s\"\r\n", diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 30a8801f22..a8e5870cb7 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -227,6 +227,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.1.2.10-rc" +#define VERSION "0.1.2.11-rc" |