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

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

21 Apr '21

commit 87d96f7162ca91c234ac4249a6b03197292b683f Merge: bba3393d20 32eea3b006 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 21 10:34:14 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4

1 0

[tor/master] Fix test naming, and fix tests on windows.
by nickm＠torproject.org 21 Apr '21

21 Apr '21

commit 5e6905ed99b7e7fb4cd329d9d1f49d9bb56104ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 13 17:38:31 2021 -0400 Fix test naming, and fix tests on windows. This is a bugfix against my fix for #40133, which has not yet appeared in 0.3.5. --- src/test/test_connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 6f716f5758..7234d01627 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -885,9 +885,9 @@ test_failed_orconn_tracker(void *arg) #define CONNECTION_TESTCASE(name, fork, setup) \ { #name, test_conn_##name, fork, &setup, NULL } -/* where arg is an expression (constant, variable, compound expression) */ +/* where arg is a string. */ #define CONNECTION_TESTCASE_ARG(name, fork, setup, arg) \ - { #name "_" #arg, test_conn_##name, fork, &setup, (void *)arg } + { #name "_" arg, test_conn_##name, fork, &setup, (void *)arg } struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st),

1 0

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

21 Apr '21

commit a4a3721690b52b4e101593b42eac5072082a77e8 Merge: cd75eac743 87d96f7162 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5

1 0

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

21 Apr '21

commit 38bfb3cdfee3e62c94b9d2bb41f745ac643002ae Merge: 0ceacb5482 a4a3721690 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5
by nickm＠torproject.org 21 Apr '21

21 Apr '21

commit 32eea3b006f917183012b3fd1aba8e4ac3501b4d Merge: 131e2d99a4 5e6905ed99 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Apr 21 16:48:22 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5 src/test/test_connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.6'
by nickm＠torproject.org 21 Apr '21

21 Apr '21

commit fe9bd6bd9675262bdd8fa4efb73818ae98545b89 Merge: cbf71c4fa7 38bfb3cdfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.4.6'

1 0

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

21 Apr '21

commit a4a3721690b52b4e101593b42eac5072082a77e8 Merge: cd75eac743 87d96f7162 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5
by nickm＠torproject.org 21 Apr '21

21 Apr '21

commit 32eea3b006f917183012b3fd1aba8e4ac3501b4d Merge: 131e2d99a4 5e6905ed99 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Apr 21 16:48:22 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5 src/test/test_connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

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

21 Apr '21

commit 38bfb3cdfee3e62c94b9d2bb41f745ac643002ae Merge: 0ceacb5482 a4a3721690 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

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

21 Apr '21

commit 5f35664b1543aae92f38bc2f1afbfe5b7920e56c Merge: c2997d7ee7 32eea3b006 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5

1 0