bump to 0.1.1.15-rc

svn:r6126

5 files changed, 9 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index e413343214..26ced172b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
-Changes in version 0.1.1.15-rc - 2006-03-09
-  o Bugfixes and cleanups on 0.1.1.x:
+Changes in version 0.1.1.15-rc - 2006-03-11
+  o Bugfixes and cleanups:
     - When we're printing strings from the network, don't try to print
       non-printable characters. This protects us against shell escape
       sequence exploits, and also against attacks to fool humans into
@@ -12,6 +12,9 @@ Changes in version 0.1.1.15-rc - 2006-03-09
     - Fix a seg fault in the controller's "getinfo orconn-status" command
       while listing status on incoming handshaking connections. Introduce
       a status name "NEW" for these connections.
+    - If we get a linelist or linelist_s config option from the torrc
+      (e.g. ExitPolicy) and it has no value, warn and skip rather than
+      silently resetting it to its default.
     - Don't abandon entry guards until they've been down or gone for
       a whole month.
     - Cleaner and quieter log messages.
diff --git a/configure.in b/configure.in
index 2914690853..a0c82ce161 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl See LICENSE for licensing information
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.1.1.14-alpha-cvs)
+AM_INIT_AUTOMAKE(tor, 0.1.1.15-rc)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor.nsi b/contrib/tor.nsi
index 9b1cf0a3e6..fc830bc2ae 100644
--- a/contrib/tor.nsi
+++ b/contrib/tor.nsi
@@ -31,7 +31,7 @@
 
 !include "MUI.nsh"
 
-!define VERSION "0.1.1.14-alpha-cvs"
+!define VERSION "0.1.1.15-rc"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "http://tor.eff.org/"
 
diff --git a/doc/TODO b/doc/TODO
index 515bc89243..f0e5c9bc25 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -29,7 +29,7 @@ Website:
   - put the logo on the website, in source form, so people can put it on
     stickers directly, etc.
 
-for 0.1.1.x-rc:
+for 0.1.1.x-final:
 N - building on freebsd 6.0: (with multiple openssl installations)
     . <nickm> "Let's try to find a way to make it run and make the version
        match, but if not, let's just make it run."
@@ -45,15 +45,7 @@ N - building on freebsd 6.0: (with multiple openssl installations)
     - authorities should *never* 503 a cache, but *should* 503 clients
       when they feel like it.
     - update dir-spec with what we decided for each of these
-  o when logging unknown http headers, this could include bad escape codes?
-    more generally, attacker-controller log entries with newlines in them
-    are dangerous for our users.
-    o So... add functions to escape potentially malicious values before
-      logging them, and test values more closely as they arrive...
-    o But what to do about contact_info and platform?
-    o (Didn't finish converting rend*.c)
 
-for 0.1.1.x-final:
   - find 10 dirservers.
     - Make it no longer default for v2 dirservers to support v1.
     - non-versioning dirservers don't need to set recommended*versions.
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 0084163b2c..a0cb725dde 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -221,5 +221,5 @@
 #define HAVE_EVENT_H
 
 /* Version number of package */
-#define VERSION "0.1.1.14-alpha-cvs"
+#define VERSION "0.1.1.15-rc"