diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-07 15:13:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-07 15:13:01 -0400 |
| commit | ed8362718fdf04d149aaf4df2cd9e9dda3329e24 (patch) | |
| tree | 3ac0d3edc085a155ee2579b1afe2f132e09578a1 | |
| parent | 00a9fafdbabe71f56d37ff4bc69d3920278d380b (diff) | |
| parent | da29074fc4dce509aec048903e7e854a44c1d825 (diff) | |
| download | tor-ed8362718fdf04d149aaf4df2cd9e9dda3329e24.tar.gz tor-ed8362718fdf04d149aaf4df2cd9e9dda3329e24.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 77af12b0bc..61a0c3238e 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.16-dev]) +AC_INIT([tor],[0.2.9.17]) 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 3a45741d8d..0484641f94 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.15-dev" +!define VERSION "0.2.9.17" !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 badfab7877..457c7469c5 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.15-dev" +#define VERSION "0.2.9.17" |