diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-25 09:29:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-25 09:29:00 -0400 |
| commit | fd59766a9cf5853bce5fa884afed8c8a48ae16b8 (patch) | |
| tree | 5feb2ab7a7f836836a15044676572ef3328ec48c | |
| parent | cff872f5155bdaf1aee8be48b6e1cb701f736ee7 (diff) | |
| parent | faf568fa7e8cfbebc236b6aef743251b7e6b9df4 (diff) | |
| download | tor-fd59766a9cf5853bce5fa884afed8c8a48ae16b8.tar.gz tor-fd59766a9cf5853bce5fa884afed8c8a48ae16b8.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 79af3d4b6f..6fb101bf9b 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.16]) +AC_INIT([tor],[0.2.8.16-dev]) 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 60ee61ff8f..b9eac37c53 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.15-dev" +!define VERSION "0.2.8.16-dev" !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 1f256c2049..211243d1dc 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.15-dev" +#define VERSION "0.2.8.16-dev" |