diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-01 09:35:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-01 09:35:43 -0500 |
| commit | 235083308add586c0b86b2e0ce8af7c9a7f4b5c0 (patch) | |
| tree | b93328b943ed94229ffdb737bfe5dab108bfdf9a | |
| parent | f3c581ee218efc5ed6f15874ef8683f6efb9f571 (diff) | |
| parent | dc3890439f156d4c79b153f13f7ecf3393362b29 (diff) | |
| download | tor-235083308add586c0b86b2e0ce8af7c9a7f4b5c0.tar.gz tor-235083308add586c0b86b2e0ce8af7c9a7f4b5c0.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 94cebf401c..18bad71a4c 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.17]) +AC_INIT([tor],[0.2.8.17-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 b9076fbc73..2ab2b14efd 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.17" +!define VERSION "0.2.8.17-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 9db6ef2094..b0292b111a 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.17" +#define VERSION "0.2.8.17-dev" |