bump stable to 0.1.2.18-dev; we should put out a 0.1.2.19 soon.

svn:r13046

4 files changed, 7 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 2a43c8c2cc..464784b46b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.1.2.19 - 2007-??-??
+Changes in version 0.1.2.19 - 2008-01-??
   o Security fixes:
     - Exit policies now reject connections that are addressed to a
       relay's public (external) IP address too, unless
@@ -16,6 +16,9 @@ Changes in version 0.1.2.19 - 2007-??-??
     - Stop thinking that 0.1.2.x directory servers can handle "begin_dir"
       requests. Should ease bugs 406 and 419 where 0.1.2.x relays are
       crashing or mis-answering these requests.
+    - When we decide to send a 503 response to a request for servers, do
+      not then also send the server descriptors: this defeats the whole
+      purpose. Fixes bug 539.
 
   o Minor bugfixes:
     - Changing the ExitPolicyRejectPrivate setting should cause us to
@@ -26,9 +29,6 @@ Changes in version 0.1.2.19 - 2007-??-??
     - Fix a couple of hard-to-trigger autoconf problems that could result
       in really weird results on platforms whose sys/types.h files define
       nonstandard integer types.
-    - When we decide to send a 503 response to a request for servers, do
-      not then also send the server descriptors: this defeats the whole
-      purpose.  Fixes bug 539.
     - Don't try to create the datadir when running --verify-config or
       --hash-password. Resolves bug 540.
 
diff --git a/configure.in b/configure.in
index 2cfaaa3a4f..98bf777567 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.18)
+AM_INIT_AUTOMAKE(tor, 0.1.2.18-dev)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 1b8f7ed640..c0974761d3 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.18"
+!define VERSION "0.1.2.18-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 876086d1dc..50480cb19e 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.18"
+#define VERSION "0.1.2.18-dev"