diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-08 09:04:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-08 09:04:44 -0500 |
| commit | c4a91e04247bfb2b6c61616a4c41a00223487464 (patch) | |
| tree | 0ecb49d416fe1507102c2791b2216f857a22d1ef | |
| parent | 7968baba4f60022e5444d48a6a4a686744bece1d (diff) | |
| parent | 4732e150e83fdc4d07f5741ed6e9451901b0e9e2 (diff) | |
| download | tor-c4a91e04247bfb2b6c61616a4c41a00223487464.tar.gz tor-c4a91e04247bfb2b6c61616a4c41a00223487464.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 fb5d6d728b..3113366001 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.10-dev]) +AC_INIT([tor],[0.2.8.11]) 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 a36123f0c3..17e6f03220 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.10-dev" +!define VERSION "0.2.8.11" !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 923d520d47..29a9f6fa21 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.10-dev" +#define VERSION "0.2.8.11" |