summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-19 11:57:44 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-19 11:57:44 -0400
commita3139c97506a2941e620b35423dffc3e513426c3 (patch)
tree801828cf41dcac437f8784ee543b089bd1327de0
parent5641e27ffbd1016ed88e05f10319a2b041b5e167 (diff)
downloadtor-a3139c97506a2941e620b35423dffc3e513426c3.tar.gz
tor-a3139c97506a2941e620b35423dffc3e513426c3.zip
Bump master to 0.3.2.0-alpha-dev. For 0.3.1, use maint-0.3.1
-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 0c673d033d..aa43c15391 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.1.3-alpha-dev])
+AC_INIT([tor],[0.3.2.0-alpha-dev])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index d3df39135f..9f3a86a695 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.3.1.3-alpha-dev"
+!define VERSION "0.3.2.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 696f6fee8b..9b16c64752 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.3.1.3-alpha-dev"
+#define VERSION "0.3.2.0-alpha-dev"