diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-19 10:13:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-19 10:13:10 -0500 |
| commit | f2270bf53f8d4ad1cda7eef62ebb64872d3f3c0a (patch) | |
| tree | 2b973b88ac7fa05b3389130021bbde1085e8a474 | |
| parent | 01ab67e38b358ae98775d1b30e5f83938af19d21 (diff) | |
| parent | 897d3c6d13638a39d2e5e17e1a30aa572243b342 (diff) | |
| download | tor-f2270bf53f8d4ad1cda7eef62ebb64872d3f3c0a.tar.gz tor-f2270bf53f8d4ad1cda7eef62ebb64872d3f3c0a.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -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 2a7548f990..7ba4a4139e 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.9.8]) +AC_INIT([tor],[0.2.9.8-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 8729946bdb..c665696862 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.9.8" +!define VERSION "0.2.9.8-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 bdb754dfea..86b05a13e1 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.8" +#define VERSION "0.2.9.8-dev" |