diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-10 11:52:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-10 11:52:23 -0400 |
| commit | dcce26331cc7e84a04f907b1bc790596bf9a759f (patch) | |
| tree | d09cc006154be38dc785bff73dabe76afde053a8 | |
| parent | 4000666eee97b5a4dc590928c4b59164ab3adad5 (diff) | |
| parent | b2fc57426c29f28ade658c642cd692c022d88b42 (diff) | |
| download | tor-dcce26331cc7e84a04f907b1bc790596bf9a759f.tar.gz tor-dcce26331cc7e84a04f907b1bc790596bf9a759f.zip | |
Merge branch 'maint-0.4.0' into release-0.4.0
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 3304b5cabb..dc8fa70863 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.3-alpha-dev]) +AC_INIT([tor],[0.4.0.4-rc]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-03-23"], # for 0.4.0.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-10"], # for 0.4.0.4-rc [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 0d0d4f493e..4100b46191 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.4.0.3-alpha-dev" +!define VERSION "0.4.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 d3441610b6..09d38cb1eb 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.4.0.3-alpha-dev" +#define VERSION "0.4.0.4-rc" |