diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-24 09:10:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-24 09:10:42 -0400 |
| commit | 078604630dad7edc57cc9378102de65f06586efd (patch) | |
| tree | 4d59837309968bf602082ed4d1ceb23aa3669ac5 | |
| parent | 8669a1ea50075a05d7f0f3b592748c76b44be10c (diff) | |
| parent | 743eee4930e7f5e37e18cc0f81e86133ab62885f (diff) | |
| download | tor-078604630dad7edc57cc9378102de65f06586efd.tar.gz tor-078604630dad7edc57cc9378102de65f06586efd.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 4eeb34dca8..f989534a67 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-dev]) +AC_INIT([tor],[0.2.5.15]) 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 af09326f12..519a73d2cb 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-dev" +!define VERSION "0.2.5.15" !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 5e670c35c1..6cbd31e521 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-dev" +#define VERSION "0.2.5.15" |