diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-07-28 04:08:18 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-07-28 04:08:18 -0400 |
| commit | 598c61362f1b3d3e3a93d15240c7306d955273be (patch) | |
| tree | f421163ee642d74b411bc7c038f8b23bb061d313 | |
| parent | 9ac169584481b14f97397507fd208a967a187880 (diff) | |
| parent | fcbb21b414947d8ad7e4298d3952b84d8005dabc (diff) | |
| download | tor-0.2.4.23.tar.gz tor-0.2.4.23.zip | |
Merge branch 'maint-0.2.4' into release-0.2.4tor-0.2.4.23
Conflicts:
configure.ac
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
| -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 3e57bed47e..3456013320 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.22]) +AC_INIT([tor],[0.2.4.23]) 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 a2132119ba..23a01b46c3 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.22" +!define VERSION "0.2.4.23" !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 fe7491f605..c86e2b0fae 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.22" +#define VERSION "0.2.4.23" |