tor

commit 5343d2b03c8158fcd9c8811e367e26ac6bfa9827
parent e3b1573be6aefc91946fa4649591ed1690d77ee8
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  5 Jun 2017 16:35:40 -0400

Merge branch 'maint-0.3.0'

Diffstat:
M
src/test/test_link_handshake.c
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
@@ -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;