diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-05-10 10:55:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-05-10 10:55:16 -0400 |
| commit | 9b9fa62f267a8a53f35da453cb9a1e9b8abbc350 (patch) | |
| tree | 7f116f84ec635ee41b12e68307f41ba37ad6b736 | |
| parent | a980597a6717a23a6a4ca9fb3d3708bc62b74c85 (diff) | |
| parent | af6da4a36b533bdba0d0c8b47d18d63529a48ceb (diff) | |
| download | tor-9b9fa62f267a8a53f35da453cb9a1e9b8abbc350.tar.gz tor-9b9fa62f267a8a53f35da453cb9a1e9b8abbc350.zip | |
Merge branch 'maint-0.4.6' into release-0.4.6
| -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 af9dfb8057..2cdff796b1 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.6.3-rc]) +AC_INIT([tor],[0.4.6.3-rc-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # 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, ["2021-05-07"], # for 0.4.6.3-rc +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-05-10"], # for 0.4.6.3-rc-dev [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 1c96ffbaad..b56afe7f08 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.6.3-rc" +!define VERSION "0.4.6.3-rc-dev" !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 8061261e18..2301f40fe0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.6.3-rc" +#define VERSION "0.4.6.3-rc-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR |