diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-17 14:57:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-17 14:57:33 -0400 |
| commit | 3e920a3468f5c99bff6a3045133f001a1871d0fe (patch) | |
| tree | c1ae7d57e8353261b47564793befe3efc989a95c | |
| parent | 4d1e39b21b961c574a8832d2698c66dc0f9614fa (diff) | |
| parent | 0fa3811c787ed4d80f395bbf464271d3cbb2852e (diff) | |
| download | tor-3e920a3468f5c99bff6a3045133f001a1871d0fe.tar.gz tor-3e920a3468f5c99bff6a3045133f001a1871d0fe.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 3c80e71c57..37827d6ab6 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.8-dev]) +AC_INIT([tor],[0.2.8.9]) 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 25998d4272..59cb38160a 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.8-dev" +!define VERSION "0.2.8.9" !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 56def12f22..2b98d1cfd9 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.8-dev" +#define VERSION "0.2.8.9" |