diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-10 09:42:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-10 09:42:57 -0400 |
| commit | 544f73d25f309bbf034119429775d3ac22c027c2 (patch) | |
| tree | fbf1ec1e2e0c8b28c56ce4dd1a94878fdf819b1a | |
| parent | a1507572110439604c9fc75168d0d1e585832a65 (diff) | |
| parent | 8408331b3e965dfad3c79fadc51f0b01eed366fe (diff) | |
| download | tor-544f73d25f309bbf034119429775d3ac22c027c2.tar.gz tor-544f73d25f309bbf034119429775d3ac22c027c2.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 5b541d7c9a..67265c5ba1 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.2.12]) +AC_INIT([tor],[0.3.2.12-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 8c84e3659c..de2cf59c05 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.2.12" +!define VERSION "0.3.2.12-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 fcdc090d44..442371a867 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.2.12" +#define VERSION "0.3.2.12-dev" |