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

[arma@xxxxxxxx]

Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date: Thu, 19 Nov 2009 14:16:11 -0500
Subject: bump to 0.2.2.6-alpha
Commit: 1ee580407ccb91304cf7ae24c0d809f57e6b4ccc

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

diff --git a/ChangeLog b/ChangeLog
index 8a34328..c00fcdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.2.6-alpha - 2009-11-17
+Changes in version 0.2.2.6-alpha - 2009-11-19
   o Major features:
     - Directory authorities can now create, vote on, and serve multiple
       parallel formats of directory data as part of their voting process.
diff --git a/configure.in b/configure.in
index 32f28b5..6f2baf7 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.5-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.2.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 44660ed..5cf9f22 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.5-alpha-dev"
+!define VERSION "0.2.2.6-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 37a1b10..101fd0c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -226,7 +226,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.2.5-alpha-dev"
+#define VERSION "0.2.2.6-alpha"
 
 
 
-- 
1.5.6.5