diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-22 09:37:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-22 09:37:31 -0400 |
| commit | 8691046ac668282de421bd66c14748faac693749 (patch) | |
| tree | 72ce1a0faaabc94f28237d0e667f499e253ed6bb | |
| parent | 3cfceeb45d51f8f3c4960cabaad1849dcecb14a3 (diff) | |
| parent | c1ad40627bbccf2682f56053c77ff719c822cbce (diff) | |
| download | tor-8691046ac668282de421bd66c14748faac693749.tar.gz tor-8691046ac668282de421bd66c14748faac693749.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -rw-r--r-- | src/or/connection_edge.c | 1 | ||||
| -rw-r--r-- | src/test/test_tortls.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index a47f044e08..003f84adb3 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -4166,4 +4166,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 bb899a9577..a661eb5c5d 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -2784,7 +2784,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), @@ -2828,4 +2828,3 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(context_init_one, 0), END_OF_TESTCASES }; - |