Merge branch 'maint-0.3.0'

This commit is contained in:
Nick Mathewson 2017-06-05 16:35:40 -04:00
commit 5343d2b03c

View File

@ -148,9 +148,9 @@ test_link_handshake_certs_ok(void *arg)
/* c1 has started_here == 1 */
{
const tor_x509_cert_t *link = NULL;
tt_assert(!tor_tls_get_my_certs(1, &link, NULL));
mock_own_cert = tor_x509_cert_dup(link);
const tor_x509_cert_t *link_cert = NULL;
tt_assert(!tor_tls_get_my_certs(1, &link_cert, NULL));
mock_own_cert = tor_x509_cert_dup(link_cert);
}
c1->base_.state = OR_CONN_STATE_OR_HANDSHAKING_V3;