diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-12-06 10:23:00 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-12-06 10:23:00 -0500 |
| commit | 90638c3be75e811512d21923fea84d71b7ce69c9 (patch) | |
| tree | bfb060b14e01390c978898e5cf8cb3eef67f82d0 | |
| parent | 7f1658daa3cb44b713f436e1e33bf121be566a6d (diff) | |
| parent | 2be4c8319aacbe85518722373cd485bd945c3960 (diff) | |
| download | tor-90638c3be75e811512d21923fea84d71b7ce69c9.tar.gz tor-90638c3be75e811512d21923fea84d71b7ce69c9.zip | |
Merge branch 'maint-0.4.5' into release-0.4.5tor-0.4.5.15
| -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 f26ed14229..24d086434a 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.14-dev]) +AC_INIT([tor],[0.4.5.15]) 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, ["2022-08-12"], # for 0.4.5.14-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-12-06"], # for 0.4.5.15 [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 c89d9de778..81465d5a4c 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.14-dev" +!define VERSION "0.4.5.15" !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 2a46b93d9d..d770615d90 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.14-dev" +#define VERSION "0.4.5.15" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR |