diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-13 12:06:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-13 12:06:52 -0500 |
| commit | 4c015d9fe4abf54f5e3d8929fa62b916789e158f (patch) | |
| tree | 31d98958cae97443ebd7b34300064ecf2dfa5cf9 | |
| parent | 37fba82c155dda2ba5d4b3bdd63ea4cd54f264ee (diff) | |
| parent | 93b3c4b8448914b6f3753829a965603fe15c059c (diff) | |
| download | tor-4c015d9fe4abf54f5e3d8929fa62b916789e158f.tar.gz tor-4c015d9fe4abf54f5e3d8929fa62b916789e158f.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 0868223132..c5163b8202 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.6-alpha-dev]) +AC_INIT([tor],[0.3.2.7-rc]) 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 4a4fc51f92..f37b3a8d09 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.6-alpha-dev" +!define VERSION "0.3.2.7-rc" !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 5bd1f47e58..5fa0c1dd0a 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.6-alpha-dev" +#define VERSION "0.3.2.7-rc" |