From: Roger Dingledine <arma@torproject.org>
Date: Wed, 23 Sep 2009 02:15:56 +0000 (-0400)
Subject: bump to 0.2.2.3-alpha, plus add a changelog for bug 1103
X-Git-Tag: tor-0.2.2.3-alpha~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e3af72ed0ee10b732de1ceddd0d5c0e370bca52;p=thirdparty%2Ftor.git

bump to 0.2.2.3-alpha, plus add a changelog for bug 1103
---

diff --git a/ChangeLog b/ChangeLog
index 7f9dc205da..8651669562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 Changes in version 0.2.2.3-alpha - 2009-09-23
+  o Major bugfixes:
+    - Fix an overzealous assert in our new circuit build timeout code.
+
   o Minor bugfixes:
     - If the networkstatus consensus tells us that we should use a
       negative circuit package window, ignore it. Otherwise we'll
diff --git a/configure.in b/configure.in
index 91e86cdc7b..e2ae2a1537 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.2.2.2-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.2.3-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 9687a1f127..5fe14e8658 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -9,7 +9,7 @@
 !include "FileFunc.nsh"
 !insertmacro GetParameters
   
-!define VERSION "0.2.2.2-alpha-dev"
+!define VERSION "0.2.2.3-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 6989dbb661..ef62990712 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -226,5 +226,5 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.2.2-alpha-dev"
+#define VERSION "0.2.2.3-alpha"