summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-02-24 10:31:05 -0500
committerNick Mathewson <nickm@torproject.org>2015-02-24 10:31:05 -0500
commite49d63a7cedf9a71ffc57a81941a5dbd1af227c1 (patch)
tree94fd754c566e4fb7440acefb2491f37f0d5e9160
parentaf60e7566eaad9124eab5aa5476ed945fcd0e707 (diff)
downloadtor-e49d63a7cedf9a71ffc57a81941a5dbd1af227c1.tar.gz
tor-e49d63a7cedf9a71ffc57a81941a5dbd1af227c1.zip
Bump master to 0.2.7tor-0.2.7.0-root
-rw-r--r--configure.ac2
-rw-r--r--contrib/win32build/tor-mingw.nsi.in2
-rw-r--r--src/win32/orconfig.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index aaad11ff91..e5e36d5c07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
-AC_INIT([tor],[0.2.6.3-alpha-dev])
+AC_INIT([tor],[0.2.7.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 24757a8f4b..7729703579 100644
--- 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.6.3-alpha-dev"
+!define VERSION "0.2.7.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 e3a5205c08..6745bcc9f5 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -232,7 +232,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.6.3-alpha-dev"
+#define VERSION "0.2.7.0-alpha-dev"