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 | 76be75b36721c18292a315e7a6adcb88950b6f09 (patch) | |
| tree | 42854adf97ccded519f194cb34dc8dac912046a5 | |
| parent | 586a9ea8321d3584f3a17216af865419cf057d81 (diff) | |
| parent | 9068e2fa280395ba15d30465ec25141cff876922 (diff) | |
| download | tor-76be75b36721c18292a315e7a6adcb88950b6f09.tar.gz tor-76be75b36721c18292a315e7a6adcb88950b6f09.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -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 12fe2f57c9..7a97c632d1 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 b0aec88ec3..4febd82ddc 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 }; - |