diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-07-25 09:01:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-07-25 09:01:38 -0400 |
| commit | d62af7ae3f233fb62d0591b739edb9a1a149a05b (patch) | |
| tree | 3655032e60a858463f357d6577f46f0a8552d089 | |
| parent | 08b3436ae8b244787faae1b98d7c8d0e38f7ba21 (diff) | |
| parent | b2a6b52825cbe3925692bbb00214b0d460333d9a (diff) | |
| download | tor-d62af7ae3f233fb62d0591b739edb9a1a149a05b.tar.gz tor-d62af7ae3f233fb62d0591b739edb9a1a149a05b.zip | |
Merge branch 'maint-0.4.1' into release-0.4.1
| -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 cbad429ce3..63b864d1b9 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.1.3-alpha-dev]) +AC_INIT([tor],[0.4.1.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-06-25"], # for 0.4.1.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-07-25"], # for 0.4.1.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 0a56429112..b20d276a7c 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.1.3-alpha-dev" +!define VERSION "0.4.1.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 8b0855987a..64dccf2e1d 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.1.3-alpha-dev" +#define VERSION "0.4.1.4-rc" |