diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-12-19 08:07:37 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-12-19 08:07:37 -0500 |
commit | fe7a0c34b05db5f4a8a91353c1615ab9cde33095 (patch) | |
tree | 08d85a450a64ac8d861de7865b0734d5b64a3259 | |
parent | 5d68e5b8fcf5c807cbf0d3d65a3bb6b181faea0d (diff) | |
parent | b838e1f927b1a367111e27db5d4c1eb5beee0036 (diff) | |
download | tor-fe7a0c34b05db5f4a8a91353c1615ab9cde33095.tar.gz tor-fe7a0c34b05db5f4a8a91353c1615ab9cde33095.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 082eca37f9..d004c78b63 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.11-dev]) +AC_INIT([tor],[0.2.8.12]) 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 af5aa67a2d..81321087df 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.11-dev" +!define VERSION "0.2.8.12" !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 b05335c436..97263bae2a 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.11-dev" +#define VERSION "0.2.8.12" |