diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-07 15:13:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-07 15:13:34 -0400 |
| commit | 92a88fede564dbc723ab77d952f89d3fac7bc430 (patch) | |
| tree | 85d94cbd3dfd48dd216356341379fd5cbbea7465 | |
| parent | f869cd012352310bcae232920d5e1941063e600b (diff) | |
| parent | 36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0 (diff) | |
| download | tor-92a88fede564dbc723ab77d952f89d3fac7bc430.tar.gz tor-92a88fede564dbc723ab77d952f89d3fac7bc430.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 88d4730dd6..5b541d7c9a 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.11-dev]) +AC_INIT([tor],[0.3.2.12]) 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 7f2220153d..8c84e3659c 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.10-dev" +!define VERSION "0.3.2.12" !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 f5186fd242..fcdc090d44 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.10-dev" +#define VERSION "0.3.2.12" |