diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-06-08 14:06:56 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-06-08 14:06:56 -0400 |
commit | 24bc8caf35818bda598f53a3a294b0920d3d3bf6 (patch) | |
tree | 23c5fa9d60cec3f5feccabf206de8e91cc10d184 | |
parent | e14006a5454f555c1552094a52f8b4120c353ddd (diff) | |
parent | 1a7af7470fdd6173f1b876fc6fee2b171174b4ff (diff) | |
download | tor-24bc8caf35818bda598f53a3a294b0920d3d3bf6.tar.gz tor-24bc8caf35818bda598f53a3a294b0920d3d3bf6.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 da797e5586..4eeb34dca8 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.14]) +AC_INIT([tor],[0.2.5.14-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 3e55030557..af09326f12 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.14" +!define VERSION "0.2.5.14-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 d45f51e3a5..5e670c35c1 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.14" +#define VERSION "0.2.5.14-dev" |