August 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit c1ad40627bbccf2682f56053c77ff719c822cbce Merge: a5bbe3f1d 9068e2fa2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)

1 0

[tor/maint-0.3.3] Mark cert_matches_key as not-intrusive; fix stretch compilation.
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 9068e2fa280395ba15d30465ec25141cff876922 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 22 09:37:26 2018 -0400 Mark cert_matches_key as not-intrusive; fix stretch compilation. --- src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 12fe2f57c..7a97c632d 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3823,4 +3823,3 @@ connection_edge_free_all(void) smartlist_free(pending_entry_connections); pending_entry_connections = NULL; } - diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index b0aec88ec..4febd82dd 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -2779,7 +2779,7 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(always_accept_verify_cb, 0), INTRUSIVE_TEST_CASE(x509_cert_free, 0), LOCAL_TEST_CASE(x509_cert_get_id_digests, 0), - INTRUSIVE_TEST_CASE(cert_matches_key, 0), + LOCAL_TEST_CASE(cert_matches_key, 0), INTRUSIVE_TEST_CASE(cert_get_key, 0), LOCAL_TEST_CASE(get_my_client_auth_key, TT_FORK), LOCAL_TEST_CASE(get_my_certs, TT_FORK), @@ -2823,4 +2823,3 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(context_init_one, 0), END_OF_TESTCASES }; -

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit c1ad40627bbccf2682f56053c77ff719c822cbce Merge: a5bbe3f1d 9068e2fa2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)

1 0

[tor/maint-0.3.2] Mark cert_matches_key as not-intrusive; fix stretch compilation.
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 9068e2fa280395ba15d30465ec25141cff876922 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 22 09:37:26 2018 -0400 Mark cert_matches_key as not-intrusive; fix stretch compilation. --- src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 12fe2f57c..7a97c632d 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3823,4 +3823,3 @@ connection_edge_free_all(void) smartlist_free(pending_entry_connections); pending_entry_connections = NULL; } - diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index b0aec88ec..4febd82dd 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -2779,7 +2779,7 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(always_accept_verify_cb, 0), INTRUSIVE_TEST_CASE(x509_cert_free, 0), LOCAL_TEST_CASE(x509_cert_get_id_digests, 0), - INTRUSIVE_TEST_CASE(cert_matches_key, 0), + LOCAL_TEST_CASE(cert_matches_key, 0), INTRUSIVE_TEST_CASE(cert_get_key, 0), LOCAL_TEST_CASE(get_my_client_auth_key, TT_FORK), LOCAL_TEST_CASE(get_my_certs, TT_FORK), @@ -2823,4 +2823,3 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(context_init_one, 0), END_OF_TESTCASES }; -

1 0

[tor/maint-0.2.9] Mark cert_matches_key as not-intrusive; fix stretch compilation.
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 9068e2fa280395ba15d30465ec25141cff876922 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 22 09:37:26 2018 -0400 Mark cert_matches_key as not-intrusive; fix stretch compilation. --- src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 12fe2f57c..7a97c632d 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3823,4 +3823,3 @@ connection_edge_free_all(void) smartlist_free(pending_entry_connections); pending_entry_connections = NULL; } - diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index b0aec88ec..4febd82dd 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -2779,7 +2779,7 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(always_accept_verify_cb, 0), INTRUSIVE_TEST_CASE(x509_cert_free, 0), LOCAL_TEST_CASE(x509_cert_get_id_digests, 0), - INTRUSIVE_TEST_CASE(cert_matches_key, 0), + LOCAL_TEST_CASE(cert_matches_key, 0), INTRUSIVE_TEST_CASE(cert_get_key, 0), LOCAL_TEST_CASE(get_my_client_auth_key, TT_FORK), LOCAL_TEST_CASE(get_my_certs, TT_FORK), @@ -2823,4 +2823,3 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(context_init_one, 0), END_OF_TESTCASES }; -

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 8691046ac668282de421bd66c14748faac693749 Merge: 3cfceeb45 c1ad40627 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)

1 0

[tor/maint-0.3.4] Mark cert_matches_key as not-intrusive; fix stretch compilation.
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 9068e2fa280395ba15d30465ec25141cff876922 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 22 09:37:26 2018 -0400 Mark cert_matches_key as not-intrusive; fix stretch compilation. --- src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 12fe2f57c..7a97c632d 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3823,4 +3823,3 @@ connection_edge_free_all(void) smartlist_free(pending_entry_connections); pending_entry_connections = NULL; } - diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index b0aec88ec..4febd82dd 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -2779,7 +2779,7 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(always_accept_verify_cb, 0), INTRUSIVE_TEST_CASE(x509_cert_free, 0), LOCAL_TEST_CASE(x509_cert_get_id_digests, 0), - INTRUSIVE_TEST_CASE(cert_matches_key, 0), + LOCAL_TEST_CASE(cert_matches_key, 0), INTRUSIVE_TEST_CASE(cert_get_key, 0), LOCAL_TEST_CASE(get_my_client_auth_key, TT_FORK), LOCAL_TEST_CASE(get_my_certs, TT_FORK), @@ -2823,4 +2823,3 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(context_init_one, 0), END_OF_TESTCASES }; -

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit c1ad40627bbccf2682f56053c77ff719c822cbce Merge: a5bbe3f1d 9068e2fa2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 8691046ac668282de421bd66c14748faac693749 Merge: 3cfceeb45 c1ad40627 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 573b6e4f2f532b77341e5307e23f3c6bf6bdc725 Merge: 81e529d23 8691046ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/or/connection_edge.c | 1 - 1 file changed, 1 deletion(-) diff --cc src/or/connection_edge.c index 046369af6,003f84adb..a21002fca --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@@ -4185,6 -4165,4 +4185,5 @@@ connection_edge_free_all(void untried_pending_connections = 0; smartlist_free(pending_entry_connections); pending_entry_connections = NULL; + mainloop_event_free(attach_pending_entry_connections_ev); } -

1 0