sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backport r9817 and r9823, and bump to 0.1.2.11-rc. 

svn:r9836
This commit is contained in:
Roger Dingledine 2007-03-16 03:00:57 +00:00
parent 9027b7acf9
commit 574f234dc7
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Changes in version 0.1.2.11-rc - 2007-03-15
o Minor bugfixes (controller):
- Correct the control spec to match how the code actually responds
to 'getinfo addr-mappings/*'.
- The control spec described a GUARDS event, but the code
implemented a GUARD event. Standardize on GUARD, but support people
asking for GUARDS too.
Changes in version 0.1.2.10-rc - 2007-03-07
o Major bugfixes (Windows):
- Do not load the NT services library functions (which may not exist)

2
configure.in
View File

@ -4,7 +4,7 @@ dnl Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
dnl See LICENSE for licensing information
AC_INIT
AM_INIT_AUTOMAKE(tor, 0.1.2.10-rc)
AM_INIT_AUTOMAKE(tor, 0.1.2.11-rc)
AM_CONFIG_HEADER(orconfig.h)
AC_CANONICAL_HOST

2
contrib/tor-mingw.nsi.in
View File

@ -5,7 +5,7 @@
;
!include "MUI.nsh"
!define VERSION "0.1.2.10-rc"
!define VERSION "0.1.2.11-rc"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "http://tor.eff.org/"

8
doc/spec/control-spec.txt
View File

@ -194,7 +194,7 @@ $Id$
EventCode = "CIRC" / "STREAM" / "ORCONN" / "BW" / "DEBUG" /
"INFO" / "NOTICE" / "WARN" / "ERR" / "NEWDESC" / "ADDRMAP" /
"AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" /
"STATUS_CLIENT" / "STATUS_SERVER" / "GUARDS" / "NS" / "STREAM_BW"
"STATUS_CLIENT" / "STATUS_SERVER" / "GUARD" / "NS" / "STREAM_BW"
Any events *not* listed in the SETEVENTS line are turned off; thus, sending
SETEVENTS with an empty body turns off all event reporting.
@ -378,8 +378,8 @@ $Id$
"addr-mappings/all"
"addr-mappings/config"
"addr-mappings/cache"
"addr-mappings/control" -- a space-separated list of address
mappings, each in the form of "from-address=to-address".
"addr-mappings/control" -- a \r\n-separated list of address
mappings, each in the form of "from-address to-address".
The 'config' key returns those address mappings set in the
configuration; the 'cache' key returns the mappings in the
client-side DNS cache; the 'control' key returns the mappings set
@ -1263,7 +1263,7 @@ $Id$
4.1.11. Our set of guard nodes has changed
Syntax:
"650" SP "GUARDS" SP Type SP Name SP Status ... CRLF
"650" SP "GUARD" SP Type SP Name SP Status ... CRLF
Type = "ENTRY"
Name = The (possibly verbose) nickname of the guard affected.
Status = "NEW" | "UP" | "DOWN" | "BAD" | "GOOD" | "DROPPED"

5
src/or/control.c
View File

@ -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",

2
src/win32/orconfig.h
View File

@ -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"