diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-12 08:24:42 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-12 08:24:42 -0500 |
| commit | 1a05d9047d0cc25cbe13a07da7bcf3faf38fc99b (patch) | |
| tree | a38b71e5e494fb96feb786f28747e8b3e26bbc15 | |
| parent | 6b6ad81c2e140d8521307ff838f9068340e244f6 (diff) | |
| parent | 8384f4d26f06f26b8ccae329b2d2ac5cdeb366d3 (diff) | |
| download | tor-1a05d9047d0cc25cbe13a07da7bcf3faf38fc99b.tar.gz tor-1a05d9047d0cc25cbe13a07da7bcf3faf38fc99b.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 699eafc51c..94774ec1f1 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.7-rc]) +AC_INIT([tor],[0.2.9.7-rc-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 f5cb477daf..d3d793b0e5 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.7-rc" +!define VERSION "0.2.9.7-rc-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 641f25a5d8..5773d043a0 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.7-rc" +#define VERSION "0.2.9.7-rc-dev" |