diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-24 11:02:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-24 11:02:17 -0400 |
| commit | 82957bf91ae6326b82fb3bb5ce8107f64c2d41ae (patch) | |
| tree | 68c50cb5c204c562be6442f518828050ed68c89b | |
| parent | 46e2c15e2fe5b8c7963bee0e651003b03603b1df (diff) | |
| parent | 57ba7ab39a31e48b4a865a7e207237474f561905 (diff) | |
| download | tor-82957bf91ae6326b82fb3bb5ce8107f64c2d41ae.tar.gz tor-82957bf91ae6326b82fb3bb5ce8107f64c2d41ae.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 4658b3a845..6918868a0e 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.6-dev]) +AC_INIT([tor],[0.2.8.7]) 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 e146694cfe..a603975cd4 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.6-dev" +!define VERSION "0.2.8.7" !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 af4cba2889..d13e33c60e 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.6-dev" +#define VERSION "0.2.8.7" |