diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | contrib/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/or/control.c | 6 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
5 files changed, 10 insertions, 10 deletions
@@ -1,4 +1,4 @@ -Changes in version 0.1.2.xx - 2007-xxxxx +Changes in version 0.1.2.17 - 2007-08-xx o Removed features: - We removed support for the old (v0) control protocol. It has been deprecated since Tor 0.1.1.1-alpha, and keeping it safe and secure @@ -8,7 +8,7 @@ Changes in version 0.1.2.xx - 2007-xxxxx - Save on most routerlist_assert_ok() calls in routerlist.c, thus greatly speeding up loading cached-routers from disk on startup (backport from trunk). - - Disable sentiel-based debugging for buffer code: we squashed all + - Disable sentinel-based debugging for buffer code: we squashed all the bugs that this was supposed to detect a long time ago, and now its only effect is to change our buffer sizes from nice powers of two (which platform mallocs tend to like) to values @@ -19,8 +19,8 @@ Changes in version 0.1.2.xx - 2007-xxxxx o Minor bugfixes (misc): - Choose perfectly fairly among routers when choosing by bandwidth and - weighting by fraction of bandwidth provided by exits. Previously, - we would choose with only approximate fairness, and correct ourselves + weighting by fraction of bandwidth provided by exits. Previously, we + would choose with only approximate fairness, and correct ourselves if we ran off the end of the list. - If we require CookieAuthentication but we fail to write the cookie file, we would warn but not exit, and end up in a state diff --git a/configure.in b/configure.in index 42c7c89972..0f430a67e5 100644 --- a/configure.in +++ b/configure.in @@ -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.16) +AM_INIT_AUTOMAKE(tor, 0.1.2.16-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 784f2a574c..889fac800d 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -5,7 +5,7 @@ ; !include "MUI.nsh" -!define VERSION "0.1.2.16" +!define VERSION "0.1.2.16-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "http://tor.eff.org/" diff --git a/src/or/control.c b/src/or/control.c index 7546c6500b..375f290cde 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2257,8 +2257,8 @@ connection_control_process_inbuf(control_connection_t *conn) char buf[128]; set_uint16(buf+2, htons(0x0000)); /* type == error */ set_uint16(buf+4, htons(0x0001)); /* code == internal error */ - strlcpy(buf+6, "The v0 control protocol is not supported by Tor 0.2.0.x " - "and later; use Tor 0.1.2.x or upgrade your controller", + strlcpy(buf+6, "The v0 control protocol is not supported anymore. " + "Upgrade your controller.", sizeof(buf)-6); body_len = 2+strlen(buf+6)+2; /* code, msg, nul. */ set_uint16(buf+0, htons(body_len)); @@ -3375,7 +3375,7 @@ control_event_guard(const char *nickname, const char *digest, /** Choose a random authentication cookie and write it to disk. * Anybody who can read the cookie from disk will be considered * authorized to use the control connection. Return -1 if we can't - * write the file, or 0 on success */ + * write the file, or 0 on success. */ int init_cookie_authentication(int enabled) { diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index e2ec086387..3c61d113b4 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.16" +#define VERSION "0.1.2.16-dev" |