diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-01 13:34:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-01 13:34:29 -0500 |
| commit | fb739ac5764e9da72622e55283d41c1136ee1067 (patch) | |
| tree | e64c4056353bb9287af8cc5c8b8a0f8438d79f12 | |
| parent | 18ee1d2029b97629875bb8ceb3649d85fd30e42d (diff) | |
| parent | 9157405c03f17635d80019eaf243388fb29df9dc (diff) | |
| download | tor-fb739ac5764e9da72622e55283d41c1136ee1067.tar.gz tor-fb739ac5764e9da72622e55283d41c1136ee1067.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 6647523e0b..eb1fac3b2d 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.9-dev]) +AC_INIT([tor],[0.2.8.10]) 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 4a4bc9bb1f..93e9516fa7 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.9-dev" +!define VERSION "0.2.8.10" !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 689f36edad..0a3d77acbe 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.9-dev" +#define VERSION "0.2.8.10" |