summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-08-16 18:54:35 +0000
committerRoger Dingledine <arma@torproject.org>2007-08-16 18:54:35 +0000
commit521b065368d4531e9bde93ffff06420fde5fa66a (patch)
tree8b27a68f13c348faf76018cfe2a3b575f178e719 /src
parent278b75619a0efff9b0d5a38125610b42f6bbce33 (diff)
downloadtor-521b065368d4531e9bde93ffff06420fde5fa66a.tar.gz
tor-521b065368d4531e9bde93ffff06420fde5fa66a.zip
bump stable to 0.1.2.16-dev since it needs some testing now
svn:r11144
Diffstat (limited to 'src')
-rw-r--r--src/or/control.c6
-rw-r--r--src/win32/orconfig.h2
2 files changed, 4 insertions, 4 deletions
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"