Bump master to 0.3.2.0-alpha-dev. For 0.3.1, use maint-0.3.1

diff --git a/configure.ac b/configure.ac
index 0c673d033da52b98b2b280bf5fb452ca8cc008b8..aa43c15391492b17a5fc7c8dda0971e7e661516a 100644 (file)
--- 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 d3df39135f31e018bee7d979435915e3d883f770..9f3a86a695657602188c8da900f934b518235a81 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.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 696f6fee8bba15d3e0eb5f74d7a574926db68d20..9b16c64752af8aa7665efcb49b64081327a17ae2 100644 (file)
--- 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"