diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-21 12:42:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-21 12:42:22 -0500 |
| commit | 63b84335dc590499e5f22498383d6a3432e91ec4 (patch) | |
| tree | d1b82c28bc0a6d3758ffe9b95d6be1df4024e439 | |
| parent | afacaa02a54dcdf0751529dbd8420b3e09009550 (diff) | |
| parent | 1a777996651bcc63e3d91391c27c5d6ec46c8015 (diff) | |
| download | tor-63b84335dc590499e5f22498383d6a3432e91ec4.tar.gz tor-63b84335dc590499e5f22498383d6a3432e91ec4.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2tor-0.3.2.8-rc
| -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 608d6864bc..f8c8884450 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.7-rc-dev]) +AC_INIT([tor],[0.3.2.8-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 e9099b1085..40459a951e 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.7-rc-dev" +!define VERSION "0.3.2.8-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 7def010cd6..674c324f87 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.7-rc-dev" +#define VERSION "0.3.2.8-rc" |