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 | c1ad40627bbccf2682f56053c77ff719c822cbce (patch) | |
| tree | 7c186d1fcf1d34e9bb28dc2085c82fbb9ddd2f2f | |
| parent | a5bbe3f1d0d8162e70af01f6b3956412dcc75946 (diff) | |
| parent | 9068e2fa280395ba15d30465ec25141cff876922 (diff) | |
| download | tor-c1ad40627bbccf2682f56053c77ff719c822cbce.tar.gz tor-c1ad40627bbccf2682f56053c77ff719c822cbce.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.2
| -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 f178917f0b..07c6ac88b4 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -4162,4 +4162,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 cd020ddd91..9a6ebeb699 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -2781,7 +2781,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), @@ -2825,4 +2825,3 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(context_init_one, 0), END_OF_TESTCASES }; - |