diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-12 10:50:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-12 10:50:28 -0400 |
| commit | 22bdc694290c48e959a44e9937d04b0b576e765d (patch) | |
| tree | c9f07f2a32421422a188bd6b755f93d3559be3ba | |
| parent | 9e44ed47acc9805e77c2d6aa562845a71ea9db5c (diff) | |
| parent | 5f46a59ba394a1b45ecc1ee52514998e774d3dca (diff) | |
| download | tor-22bdc694290c48e959a44e9937d04b0b576e765d.tar.gz tor-22bdc694290c48e959a44e9937d04b0b576e765d.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 9cf172af44..5cc9ab881a 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.25-dev]) +AC_INIT([tor],[0.2.4.26]) 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 1e578cd4a0..f16e637de6 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.25-dev" +!define VERSION "0.2.4.26" !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 d3f3eb19ad..a028e9ec46 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.25-dev" +#define VERSION "0.2.4.26" |