[or-cvs] [tor/master] bump to 0.2.2.2-alpha

[arma at seul.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Mon, 21 Sep 2009 01:31:39 -0400
Subject: bump to 0.2.2.2-alpha
Commit: 5488cda19a85f0a27249d1e97db6ef912a3137a5

---
 ChangeLog                |    8 +++-----
 configure.in             |    2 +-
 contrib/tor-mingw.nsi.in |    2 +-
 src/win32/orconfig.h     |    2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c6bfd4c..6aef77b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.2.2-alpha - 2009-09-2?
+Changes in version 0.2.2.2-alpha - 2009-09-21
   o Major features:
     - Tor now tracks how long it takes to build client-side circuits
       over time, and adapts its timeout to local network performance.
@@ -49,10 +49,8 @@ Changes in version 0.2.2.2-alpha - 2009-09-2?
       by SwissTorExit.
     - Don't warn when we're using a circuit that ends with a node
       excluded in ExcludeExitNodes, but the circuit is not used to access
-      the outside world. This should help fix bug 1090. Bugfix on
-      0.2.1.6-alpha.
-    - Teach connection_ap_can_use_exit to respect the Exclude*Nodes config
-      options. Should fix bug 1090. Bugfix on 0.0.2-pre16.
+      the outside world. This should help fix bug 1090, but more problems
+      remain. Bugfix on 0.2.1.6-alpha.
     - Work around a small memory leak in some versions of OpenSSL that
       stopped the memory used by the hostname TLS extension from being
       freed.
diff --git a/configure.in b/configure.in
index 6731f05..1edb672 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.1-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.2.2-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 0fceb05..120d233 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.1-alpha-dev"
+!define VERSION "0.2.2.2-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 205aafc..c2ccfa7 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.1-alpha-dev"
+#define VERSION "0.2.2.2-alpha"
 
-- 
1.5.6.5