diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-17 16:32:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-17 16:32:17 -0400 |
| commit | badc444f7adce748fd4c4171a3748fc08f001022 (patch) | |
| tree | 0add8fa8f846c7fabd92c41dfa4a03d342cd6ea0 | |
| parent | 44c5fc6878d91d6069ed8c58ba6ad3b1f9b2963b (diff) | |
| parent | b0f1241a1d9319387eb536c1edd0b4c15d1e8ac3 (diff) | |
| download | tor-badc444f7adce748fd4c4171a3748fc08f001022.tar.gz tor-badc444f7adce748fd4c4171a3748fc08f001022.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 37827d6ab6..fb91f34246 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]) +AC_INIT([tor],[0.2.8.9-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 59cb38160a..4a4bc9bb1f 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" +!define VERSION "0.2.8.9-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 2b98d1cfd9..689f36edad 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" +#define VERSION "0.2.8.9-dev" |