diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-07-28 04:15:24 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-07-28 04:15:24 -0400 |
| commit | 0b586b44dd78602a44a1c97df12a67fc9db3b080 (patch) | |
| tree | 1d9c81708ec8d419623bf7c216ef9a74c6986abd | |
| parent | 6c84b124aa0aad1e04bab17d5aa36112233f7e10 (diff) | |
| parent | 77609161f37dc37420f240410f2f546fc431cb8c (diff) | |
| download | tor-0b586b44dd78602a44a1c97df12a67fc9db3b080.tar.gz tor-0b586b44dd78602a44a1c97df12a67fc9db3b080.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 1d8cfa78f0..c37f154222 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.5-alpha-dev]) +AC_INIT([tor],[0.2.5.6-alpha]) 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 f7c025e7d6..5d94fd9e58 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.5-alpha-dev" +!define VERSION "0.2.5.6-alpha" !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 4698a2cbe7..8c2472c323 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.5-alpha-dev" +#define VERSION "0.2.5.6-alpha" |