commit 5742e4fd8ea28c21f4f8f8a809c88a0b31a5d73d Author: Nick Mathewson nickm@torproject.org Date: Fri May 26 10:23:53 2017 -0400

bump version to 0.3.1.2-alpha-dev --- ChangeLog | 5 +++++ configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog index ccac102..60904d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes in version 0.3.1.3-alpha - 2017-06-?? + + + + Changes in version 0.3.1.2-alpha - 2017-05-26 Tor 0.3.1.2-alpha is the second release in the 0.3.1.x series. It fixes a few bugs found while testing 0.3.1.1-alpha, including a diff --git a/configure.ac b/configure.ac index ca2a4f3..59908c7 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.2-alpha]) +AC_INIT([tor],[0.3.1.2-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 4af0fe2..b81683e 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.2-alpha" +!define VERSION "0.3.1.2-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 30b19fe..ea92179 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.2-alpha" +#define VERSION "0.3.1.2-alpha-dev"