aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-09-22 22:15:56 -0400
committerRoger Dingledine <arma@torproject.org>2009-09-22 22:15:56 -0400
commit8e3af72ed0ee10b732de1ceddd0d5c0e370bca52 (patch)
tree5db5f4e7403c07adea46f08a60065d4d05376d2a
parent0d13e0ed145f4c1b5bd1623ab529d24208304390 (diff)
downloadtor-8e3af72ed0ee10b732de1ceddd0d5c0e370bca52.tar.gz
tor-8e3af72ed0ee10b732de1ceddd0d5c0e370bca52.zip
bump to 0.2.2.3-alpha, plus add a changelog for bug 1103
-rw-r--r--ChangeLog3
-rw-r--r--configure.in2
-rw-r--r--contrib/tor-mingw.nsi.in2
-rw-r--r--src/win32/orconfig.h2
4 files changed, 6 insertions, 3 deletions
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"