[or-cvs] r11144: bump stable to 0.1.2.16-dev since it needs some testing now (in tor/branches/tor-0_1_2-patches: . contrib src/or src/win32)

[arma at seul.org]

Author: arma
Date: 2007-08-16 14:54:35 -0400 (Thu, 16 Aug 2007)
New Revision: 11144

Modified:
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/configure.in
   tor/branches/tor-0_1_2-patches/contrib/tor-mingw.nsi.in
   tor/branches/tor-0_1_2-patches/src/or/control.c
   tor/branches/tor-0_1_2-patches/src/win32/orconfig.h
Log:
bump stable to 0.1.2.16-dev since it needs some testing now


Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-08-16 18:32:45 UTC (rev 11143)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-08-16 18:54:35 UTC (rev 11144)
@@ -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 @@
     - 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 @@
 
   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

Modified: tor/branches/tor-0_1_2-patches/configure.in
===================================================================
--- tor/branches/tor-0_1_2-patches/configure.in	2007-08-16 18:32:45 UTC (rev 11143)
+++ tor/branches/tor-0_1_2-patches/configure.in	2007-08-16 18:54:35 UTC (rev 11144)
@@ -4,7 +4,7 @@
 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

Modified: tor/branches/tor-0_1_2-patches/contrib/tor-mingw.nsi.in
===================================================================
--- tor/branches/tor-0_1_2-patches/contrib/tor-mingw.nsi.in	2007-08-16 18:32:45 UTC (rev 11143)
+++ tor/branches/tor-0_1_2-patches/contrib/tor-mingw.nsi.in	2007-08-16 18:54:35 UTC (rev 11144)
@@ -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/"
 

Modified: tor/branches/tor-0_1_2-patches/src/or/control.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/control.c	2007-08-16 18:32:45 UTC (rev 11143)
+++ tor/branches/tor-0_1_2-patches/src/or/control.c	2007-08-16 18:54:35 UTC (rev 11144)
@@ -2257,8 +2257,8 @@
     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 @@
 /** 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)
 {

Modified: tor/branches/tor-0_1_2-patches/src/win32/orconfig.h
===================================================================
--- tor/branches/tor-0_1_2-patches/src/win32/orconfig.h	2007-08-16 18:32:45 UTC (rev 11143)
+++ tor/branches/tor-0_1_2-patches/src/win32/orconfig.h	2007-08-16 18:54:35 UTC (rev 11144)
@@ -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"