diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:49:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-06 09:49:06 -0400 |
| commit | 7d5ddde4872d87cdc28f203ede8ff4038efa9886 (patch) | |
| tree | 707153142b87774b469543072e78ccfefc994f17 | |
| parent | da8505205dab91f36a5d3f67ca9b4e0904d44b0a (diff) | |
| parent | 542100d3cac59dc178cb01ca639544c0f335abd3 (diff) | |
| download | tor-7d5ddde4872d87cdc28f203ede8ff4038efa9886.tar.gz tor-7d5ddde4872d87cdc28f203ede8ff4038efa9886.zip | |
Merge branch 'maint-0.2.4' into release-0.2.4
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | contrib/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 5cc9ab881a..6ffe3cc21b 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.4.26]) +AC_INIT([tor],[0.2.4.27]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index f16e637de6..a66bcd1a56 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.26" +!define VERSION "0.2.4.27" !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 a028e9ec46..baddef622a 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.4.26" +#define VERSION "0.2.4.27" |