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 | 765fd0845f58dee27e48a1a786e9dacb00663616 (patch) | |
| tree | 8db5de2bd6ce7e8e405af052a50bc5c5493d874a | |
| parent | 5a0e73c75b9c8dbad33044c1cdb0662bddb6de22 (diff) | |
| parent | 82f8b27ff550854cbb7b7fa259e0a51763357880 (diff) | |
| download | tor-765fd0845f58dee27e48a1a786e9dacb00663616.tar.gz tor-765fd0845f58dee27e48a1a786e9dacb00663616.zip | |
Merge branch 'maint-0.2.5' into release-0.2.5
| -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 f989534a67..3177782753 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.15]) +AC_INIT([tor],[0.2.5.15-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 519a73d2cb..6dc7cbd764 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.5.15" +!define VERSION "0.2.5.15-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 6cbd31e521..5ba3ec1945 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.5.15" +#define VERSION "0.2.5.15-dev" |