bump to 0.2.0.6-alpha in preparation for tomorrow's release

svn:r11275

4 files changed, 12 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index eaaddb69bd..78cde7cd4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.0.6-alpha - 2007-??-??
+Changes in version 0.2.0.6-alpha - 2007-08-26
   o Major features:
     - Directory authorities now track servers by weighted
       mean-times-between-failures. When we have 4 or more days of data,
@@ -16,29 +16,23 @@ Changes in version 0.2.0.6-alpha - 2007-??-??
       three load balancing patches could raise effective network capacity
       by a factor of four. Thanks to Mike Perry for measurements.
 
-  o Major bugfixes:
+  o Major bugfixes (descriptor parsing):
     - Handle unexpected whitespace better in malformed descriptors. Bug
       found using Benedikt Boss's new Tor fuzzer! Bugfix on 0.2.0.x.
 
-  o Minor features (misc):
+  o Minor features:
+    - There is now an ugly, temporary "desc/all-recent-extrainfo-hack"
+      GETINFO for Torstat to use until it can switch to using extrainfos.
     - Optionally (if built with -DEXPORTMALLINFO) export the output
-      of mallinfo via http, as tor/mallinfo.txt.  Only accessible
+      of mallinfo via http, as tor/mallinfo.txt. Only accessible
       from localhost.
 
-  o Minor bugfixes (bridges):
-    - Do not intermix bridge routers with controller-added routers. (Bugfix
-      on 0.2.0.x)
-
-  o Minor bugfixes (network):
+  o Minor bugfixes:
+    - Do not intermix bridge routers with controller-added
+      routers. (Bugfix on 0.2.0.x)
     - Do not fail with an assert when accept() returns an unexpected
       address family. Addresses but does not wholly fix bug 483. (Bugfix
       on 0.2.0.x)
-
-  o Minor features (controller):
-    - There is now an ugly, temporary "desc/all-recent-extrainfo-hack"
-      GETINFO for Torstat to use into it can switch to use extrainfos.
-
-  o Minor bugfixes (misc):
     - Let directory authorities startup even when they can't generate
       a descriptor immediately, e.g. because they don't know their
       address.
diff --git a/configure.in b/configure.in
index de0c0a74ca..d5c47c8bf1 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.2.0.5-alpha)
+AM_INIT_AUTOMAKE(tor, 0.2.0.6-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index f9e94ab40a..520aed7838 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -5,7 +5,7 @@
 ;
 !include "MUI.nsh"
 
-!define VERSION "0.2.0.5-alpha"
+!define VERSION "0.2.0.6-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "http://tor.eff.org/"
 
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index a5fc4c0a78..2cfae61cbd 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.2.0.5-alpha"
+#define VERSION "0.2.0.6-alpha"