diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-28 10:21:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-28 10:21:58 -0500 |
| commit | 70840ea6d53c4bbfd202ce3c83ea398e5a68822b (patch) | |
| tree | 73211d2d45b019afa4f1d27c69b60c3e31e82467 | |
| parent | e9d45f63aa12073f95ffe4c2e1375f581c204ff3 (diff) | |
| parent | 4bab288a822a5312ee2953822563e694c7274afb (diff) | |
| download | tor-70840ea6d53c4bbfd202ce3c83ea398e5a68822b.tar.gz tor-70840ea6d53c4bbfd202ce3c83ea398e5a68822b.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 4fff37157c..8e7072290d 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.27-dev]) +AC_INIT([tor],[0.2.4.28]) 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 a6fcb39eed..da24244719 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.27-dev" +!define VERSION "0.2.4.28" !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 2035613266..cca8ad0fe9 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.27-dev" +#define VERSION "0.2.4.28" |