diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-02-15 09:55:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-02-15 09:55:43 -0500 |
| commit | 18754f96579cc920922bb0565df2d6e48402d898 (patch) | |
| tree | 5a7ee1375dde5b0f7ed41d820c033eb35b741bd6 | |
| parent | 16954b3ec0bbf16660f5967b0866c4d9f269f11b (diff) | |
| parent | 18db584caf50568b591f4a9d216e87b93839a0bc (diff) | |
| download | tor-18754f96579cc920922bb0565df2d6e48402d898.tar.gz tor-18754f96579cc920922bb0565df2d6e48402d898.zip | |
Merge branch 'maint-0.4.5' into release-0.4.5
| -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 ce2ad6fb9d..a7c58d36ef 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.5.5-rc-dev]) +AC_INIT([tor],[0.4.5.6]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # 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-02-01"], # for 0.4.5.5-rc-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-02-15"], # for 0.4.5.6 [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 1d38581a8e..b0d3a8d5a7 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.5.5-rc-dev" +!define VERSION "0.4.5.6" !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 022b05fe25..008d6bfc90 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.5.5-rc-dev" +#define VERSION "0.4.5.6" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR |