May 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 15 May '20

15 May '20

commit e75583e71bf87ce6d40a801396cf3def39a60c45 Merge: b8bff426f 768ffb8f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.2] Fix use of non-portable == in configure.ac.
by nickm＠torproject.org 15 May '20

15 May '20

commit a59d54756f9b369fefdc7ca84c432d8873264f42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 09:58:49 2020 -0400 Fix use of non-portable == in configure.ac. Fixes bug 34233. (This has bug has been backported to 0.3.5, but only released in 0.4.3, so it only needs a changes file there.) --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a441162f4..5f66d8c37 100644 --- a/configure.ac +++ b/configure.ac @@ -368,7 +368,7 @@ AC_CACHE_CHECK([for __attribute__((fallthrough))], [tor_cv_c_attr_fallthrough=no] )]) CFLAGS="$saved_CFLAGS" -if test "$tor_cv_c_attr_fallthrough" == "yes"; then +if test "$tor_cv_c_attr_fallthrough" = "yes"; then AC_DEFINE(HAVE_ATTR_FALLTHROUGH, [1], [defined if we have the fallthrough attribute.]) fi

1 0

[tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 15 May '20

15 May '20

commit 768ffb8f43575baac0970659b01e0a484d6bd6de Merge: 72312cdbb a59d54756 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 15 May '20

15 May '20

commit d63eeb1b69fcc971f3a789eab72cf7c02905067b Merge: 2a9ffeb47 e75583e71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 15 May '20

15 May '20

commit d97fd7f0762603702179bf2742e0fe5fc66bedbf Merge: e26b3778d 768ffb8f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 15 May '20

15 May '20

commit ff68f4fe1df46b87ec33d25dca80458163a77f0c Merge: 2c2c349bd a59d54756 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Fix use of non-portable == in configure.ac.
by nickm＠torproject.org 15 May '20

15 May '20

commit a59d54756f9b369fefdc7ca84c432d8873264f42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 09:58:49 2020 -0400 Fix use of non-portable == in configure.ac. Fixes bug 34233. (This has bug has been backported to 0.3.5, but only released in 0.4.3, so it only needs a changes file there.) --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a441162f4..5f66d8c37 100644 --- a/configure.ac +++ b/configure.ac @@ -368,7 +368,7 @@ AC_CACHE_CHECK([for __attribute__((fallthrough))], [tor_cv_c_attr_fallthrough=no] )]) CFLAGS="$saved_CFLAGS" -if test "$tor_cv_c_attr_fallthrough" == "yes"; then +if test "$tor_cv_c_attr_fallthrough" = "yes"; then AC_DEFINE(HAVE_ATTR_FALLTHROUGH, [1], [defined if we have the fallthrough attribute.]) fi

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 15 May '20

15 May '20

commit db4815dd8e7477803bc29c89284a7641b20ab5ba Merge: ec2f6d69d 6f2b6ede1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:28:36 2020 -0400 Merge branch 'maint-0.4.3' changes/bug34233 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Add a changes file for 34233.
by nickm＠torproject.org 15 May '20

15 May '20

commit 6f2b6ede1b6b70301cfd033060f999d561f57364 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:27:49 2020 -0400 Add a changes file for 34233. This bug was merged back to 0.3.5 with our #34078 fix, but only released in 0.4.3.5, so the changes file goes here. --- changes/bug34233 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug34233 b/changes/bug34233 new file mode 100644 index 000000000..24c786978 --- /dev/null +++ b/changes/bug34233 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Fix a portability error in the configure script, where we + were using "==" instead of "=". Fixes bug 34233; bugfix on + 0.4.3.5.

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 15 May '20

15 May '20

commit ec2f6d69d7327381656ef6a5b1005aeb7247dcc3 Merge: 8d59897e5 bcaf480ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.4.3' configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0