diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-07 16:38:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-07 16:38:58 -0500 |
| commit | 50db1e825d0508e983961f6783e7e2db831d085a (patch) | |
| tree | c8b6b87a7ec671932ddf1066b18d13e6bd80d7ff | |
| parent | 528d3e12ff853f69fe0e76156448519d4839a4b9 (diff) | |
| parent | 3dfecffa7d6a3ab268983b9477cf36a01e7353f6 (diff) | |
| download | tor-50db1e825d0508e983961f6783e7e2db831d085a.tar.gz tor-50db1e825d0508e983961f6783e7e2db831d085a.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -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 d35f83cead..58eab736d6 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.4-alpha-dev]) +AC_INIT([tor],[0.2.9.5-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 94bbfe28e2..05d5a6cb2c 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.9.4-alpha-dev" +!define VERSION "0.2.9.5-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 d90242320a..db6c07bfe1 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.4-alpha-dev" +#define VERSION "0.2.9.5-alpha" |