diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-22 15:37:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-22 15:37:12 -0400 |
| commit | 53d4c505cda3e129092366f863ce16a4ad192cfa (patch) | |
| tree | 2183e025b49da3075b84afdb4bfcae22626c5fc6 | |
| parent | 31df6a7a2355fc6daa4eb327a1c81b1c81daff45 (diff) | |
| parent | ad1824f91de0a1acdc4b2830f5b7b6d841dc6eef (diff) | |
| download | tor-53d4c505cda3e129092366f863ce16a4ad192cfa.tar.gz tor-53d4c505cda3e129092366f863ce16a4ad192cfa.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 76080f4a79..6150e7baaf 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.7-dev]) +AC_INIT([tor],[0.2.8.8]) 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 1b0c23da72..a4c98cd468 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.7-dev" +!define VERSION "0.2.8.8" !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 a3ad9de231..2ca344807f 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.7-dev" +#define VERSION "0.2.8.8" |