June 2021 - tor-commits - lists.torproject.org

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 07 Jun '21

07 Jun '21

commit 6bcb0fb8812774e0714a0e5c1afb3b27acc66bca Merge: 11c7e65730 ed7f4ad4a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 7 13:29:49 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4

1 0

[tor/maint-0.4.5] Bump to 0.4.4.9
by nickm＠torproject.org 07 Jun '21

07 Jun '21

commit 1956f63d6b9357d6dc6375784fd6fea8551a7d61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 7 13:30:18 2021 -0400 Bump to 0.4.4.9 --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9ee5dd181a..1527d580b0 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.4.8-dev]) +AC_INIT([tor],[0.4.4.9]) 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-03-16"], # for 0.4.4.8-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-06-07"], # for 0.4.4.9 [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 38046e7c5d..151127df7f 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.4.8-dev" +!define VERSION "0.4.4.9" !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 1f6284727b..b26aac0fa4 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.4.8-dev" +#define VERSION "0.4.4.9" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.5] Bump to 0.4.5.9.
by nickm＠torproject.org 07 Jun '21

07 Jun '21

commit c80b98520b08b0b1bdc9c1417d5dc5c4782db670 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 7 13:31:10 2021 -0400 Bump to 0.4.5.9. --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6d7cd1dd6a..df721512fc 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.8-dev]) +AC_INIT([tor],[0.4.5.9]) 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-05-10"], # for 0.4.5.8-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-06-07"], # for 0.4.5.9 [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 8276264392..966057bab1 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.8-dev" +!define VERSION "0.4.5.9" !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 716363261c..58943025d7 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.8-dev" +#define VERSION "0.4.5.9" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 07 Jun '21

07 Jun '21

commit b3ca2faf46913fb6d1c334667e81de3570a7a177 Merge: 8b6e919086 1956f63d6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 7 13:30:36 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 "ours" to avoid version bump.

1 0

[tor/maint-0.4.6] Bump to 0.3.5.15.
by nickm＠torproject.org 07 Jun '21

07 Jun '21

commit ed7f4ad4a9309fb480495f036ebfdc9807a24848 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 7 13:29:35 2021 -0400 Bump to 0.3.5.15. --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 619e91528c..82ef4f5554 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.3.5.14-dev]) +AC_INIT([tor],[0.3.5.15]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 094a53105a..9d2e25a9e8 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.3.5.14-dev" +!define VERSION "0.3.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 1186954db9..dff63efa18 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.3.5.14-dev" +#define VERSION "0.3.5.15"

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 07 Jun '21

07 Jun '21

commit 6bcb0fb8812774e0714a0e5c1afb3b27acc66bca Merge: 11c7e65730 ed7f4ad4a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 7 13:29:49 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 07 Jun '21

07 Jun '21

commit b3ca2faf46913fb6d1c334667e81de3570a7a177 Merge: 8b6e919086 1956f63d6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 7 13:30:36 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 "ours" to avoid version bump.

1 0

[tor/maint-0.4.6] Bump to 0.4.5.9.
by nickm＠torproject.org 07 Jun '21

07 Jun '21

commit c80b98520b08b0b1bdc9c1417d5dc5c4782db670 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 7 13:31:10 2021 -0400 Bump to 0.4.5.9. --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6d7cd1dd6a..df721512fc 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.8-dev]) +AC_INIT([tor],[0.4.5.9]) 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-05-10"], # for 0.4.5.8-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-06-07"], # for 0.4.5.9 [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 8276264392..966057bab1 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.8-dev" +!define VERSION "0.4.5.9" !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 716363261c..58943025d7 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.8-dev" +#define VERSION "0.4.5.9" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 07 Jun '21

07 Jun '21

commit fe328e2f332662d7bf16adaa18f6c96c43b3f83f Merge: a4e8624db1 ed7f4ad4a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 7 13:32:35 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 07 Jun '21

07 Jun '21

commit 66701c61951a13534b3e802e478270a5f04dbd15 Merge: f832b4bcee c80b98520b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 7 13:31:21 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 "ours" to avoid version bump.

1 0