diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-14 13:22:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-14 13:22:17 -0400 |
| commit | 8d34a6ea9c7dae39b3e6066e9c207346f58ebf70 (patch) | |
| tree | f865d8e94870aff8198fae85247c1d40f8f0ccb2 | |
| parent | e38b0c2eb910b6dc26978c08a1f168e532d5b256 (diff) | |
| parent | 26f68dfcef283137e60319c003300b07c56a3209 (diff) | |
| download | tor-8d34a6ea9c7dae39b3e6066e9c207346f58ebf70.tar.gz tor-8d34a6ea9c7dae39b3e6066e9c207346f58ebf70.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -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 eeced53104..4695f111df 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.8.14-dev]) +AC_INIT([tor],[0.2.8.15]) 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 863a49bace..57002a04e5 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.8.14-dev" +!define VERSION "0.2.8.15" !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 3b3d13605f..bb09bafe09 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.14-dev" +#define VERSION "0.2.8.15" |