diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-06-08 09:29:49 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-06-08 09:29:49 -0400 |
commit | d9dd67e2169c70e32e833d1e4d93bf83d363def7 (patch) | |
tree | 69df766ed295e2b4b771590e3ed8b109d907e79f | |
parent | 0a78d2947cc1f7a0aa2ede2c37baec3e4c23a424 (diff) | |
parent | 77c5d8c73856da7f07508fc263685717bd88dbc7 (diff) | |
download | tor-d9dd67e2169c70e32e833d1e4d93bf83d363def7.tar.gz tor-d9dd67e2169c70e32e833d1e4d93bf83d363def7.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 8f85dae720..da797e5586 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.13]) +AC_INIT([tor],[0.2.5.14]) 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 9661e10ee3..3e55030557 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.13" +!define VERSION "0.2.5.14" !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 aa04092f2f..d45f51e3a5 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.13" +#define VERSION "0.2.5.14" |