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

[arma at seul.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Sat, 21 Nov 2009 22:57:05 -0500
Subject: bump to 0.2.2.6-alpha-dev
Commit: 01a9cc0413fe89f14d753a58e116ef933758684c

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

diff --git a/ChangeLog b/ChangeLog
index 1aa07a3..3fa7b38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 Changes in version 0.2.2.7-alpha - 2009-??-??
   o Minor bugfixes:
-    - Fix compilation on OSX 10.3, which has a stub mlockall() but hides it.
+    - Fix compilation on OSX 10.3, which has a stub mlockall() but
+      hides it. Bugfix on 0.2.2.6-alpha.
+
 
 Changes in version 0.2.2.6-alpha - 2009-11-19
   o Major features:
diff --git a/configure.in b/configure.in
index f419fdf..423e639 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.6-alpha)
+AM_INIT_AUTOMAKE(tor, 0.2.2.6-alpha-dev)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 5cf9f22..2a1d8e0 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.6-alpha"
+!define VERSION "0.2.2.6-alpha-dev"
 !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 101fd0c..f58bb58 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.6-alpha"
+#define VERSION "0.2.2.6-alpha-dev"
 
 
 
-- 
1.5.6.5