Bump version in master to 0.2.6.0-alpha-dev

diff --git a/ChangeLog b/ChangeLog
index 4a2918490e773e8bede2c53cd5c029ac85e690ba..fc8348d51a17ea2cdf33829c1e7943c771fd2eb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Changes in version 0.2.6.1-alpha - 2014-??-??
+
+
 Changes in version 0.2.5.5-alpha - 2014-06-18
   Tor 0.2.5.5-alpha fixes a wide variety of remaining issues in the Tor
   0.2.5.x release series, including a couple of DoS issues, some

diff --git a/configure.ac b/configure.ac
index 38d922206878fa249ae152f729d8e84a91dff67a..0d375817072d99cf3174678ffc4fb2b1c3c4caf0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2013, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.5.5-alpha-dev])
+AC_INIT([tor],[0.2.6.0-alpha-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE

diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index f7c025e7d6bb37f5f1395f0cb436d9690a28ceb6..f5c02dbb847115d1844a6fd8a657d4c7ba98aa49 100644 (file)
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.5.5-alpha-dev"
+!define VERSION "0.2.6.0-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 4698a2cbe77b67283c026d5d3df2e58f83f0e91c..2f1a53c8699b83d5643933787a5ba76e98c8d374 100644 (file)
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.5.5-alpha-dev"
+#define VERSION "0.2.6.0-alpha-dev"