diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-12-11 21:40:20 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-12-11 21:40:20 -0500 |
commit | e34700e4718d23bdd92bd5ba172118c13c45a8bf (patch) | |
tree | b4880a74dbae1ea5d08b2388c47b225c40621b9f | |
parent | 57c6895f61c248aad2649919b029be5ebf27c848 (diff) | |
parent | cf6da1e4c2e24a8670945bbe36f376be6ff62d79 (diff) | |
download | tor-e34700e4718d23bdd92bd5ba172118c13c45a8bf.tar.gz tor-e34700e4718d23bdd92bd5ba172118c13c45a8bf.zip |
Merge branch 'maint-0.2.9' into release-0.2.9
-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 292ef6690a..df68ffa8f7 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.6-rc-dev]) +AC_INIT([tor],[0.2.9.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 49aa8401df..f5cb477daf 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.2.9.6-rc-dev" +!define VERSION "0.2.9.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 65216fa12c..641f25a5d8 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.2.9.6-rc-dev" +#define VERSION "0.2.9.7-rc" |