diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-07-29 11:17:35 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-07-29 11:17:35 -0400 |
commit | 176a57fd4ce652788725c9ad514223d7dd263af4 (patch) | |
tree | 559ffd826ec3581f299ba5dc145767b2c12eff8f | |
parent | 7ebcc1b5c4a543d2ba47d9f1cfcad774454b0e91 (diff) | |
parent | 11386eb6d1573410047f0b41a4c2b6579d8d061b (diff) | |
download | tor-176a57fd4ce652788725c9ad514223d7dd263af4.tar.gz tor-176a57fd4ce652788725c9ad514223d7dd263af4.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 fa8262465d..28eef2aa84 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.5-rc-dev]) +AC_INIT([tor],[0.2.8.6]) 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 1f5bd3e27b..ba6afd1a56 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.5-rc-dev" +!define VERSION "0.2.8.6" !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 8e378920de..e4fe94262e 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.5-rc-dev" +#define VERSION "0.2.8.6" |