diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-02-28 10:40:20 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-02-28 10:40:20 -0500 |
commit | cf9844fcfa5387e054dff55d5ad0bfd538b4cec3 (patch) | |
tree | 66e23c0345c0d1afeffd04d2383b7e4dcfd1145d | |
parent | d6b62571213c34fb55c9ba5a09dbd642f7c876f4 (diff) | |
parent | 58908b6540d7296109b60e187ff788b20e79aba5 (diff) | |
download | tor-cf9844fcfa5387e054dff55d5ad0bfd538b4cec3.tar.gz tor-cf9844fcfa5387e054dff55d5ad0bfd538b4cec3.zip |
Merge branch 'maint-0.3.0' into release-0.3.0
-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 c9e0c2a4ba..4433d57f2f 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.3.0.3-alpha-dev]) +AC_INIT([tor],[0.3.0.4-rc]) 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 62e80360d5..a7fd0d3281 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.3.0.3-alpha-dev" +!define VERSION "0.3.0.4-rc" !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 ec4d62b8c2..5542452ba2 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.3.0.3-alpha-dev" +#define VERSION "0.3.0.4-rc" |