diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-12-19 08:08:52 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-12-19 08:08:52 -0500 |
commit | 49bdcfd4b6f392e6c0f15e6beaec7a7498aadc88 (patch) | |
tree | 9f5b7754aa04f8a8eaa2c311b6245495c3d37014 | |
parent | 054c1d5650ad0b49bcfb05040fc2f5fcce438b4a (diff) | |
parent | 24318fbda99d7fb316e1c377fedaeba927102145 (diff) | |
download | tor-49bdcfd4b6f392e6c0f15e6beaec7a7498aadc88.tar.gz tor-49bdcfd4b6f392e6c0f15e6beaec7a7498aadc88.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 94774ec1f1..2a7548f990 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-dev]) +AC_INIT([tor],[0.2.9.8]) 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 d3d793b0e5..8729946bdb 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-dev" +!define VERSION "0.2.9.8" !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 5773d043a0..bdb754dfea 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-dev" +#define VERSION "0.2.9.8" |