aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-28 06:59:03 -0400
committerNick Mathewson <nickm@torproject.org>2016-07-28 06:59:03 -0400
commita8676b1edecee2d1d472b7f67dd026ef7b084a2f (patch)
treed9ba30676becb8e03bbceaae9ba19a8288a2eb1d /src/or/routerlist.c
parentf0488551e7be4e2d21a104903a86be993a240398 (diff)
parent47573038736b96e2a353a25ed3c788dcb77d8fcb (diff)
downloadtor-a8676b1edecee2d1d472b7f67dd026ef7b084a2f.tar.gz
tor-a8676b1edecee2d1d472b7f67dd026ef7b084a2f.zip
Merge branch 'bug18902_squashed'
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 2fe8c3b629..f87dbed145 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -917,7 +917,6 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now,
*/
digestmap_t *pending_id;
fp_pair_map_t *pending_cert;
- authority_cert_t *cert;
/*
* The missing_id_digests smartlist will hold a list of id digests
* we want to fetch the newest cert for; the missing_cert_digests
@@ -1027,8 +1026,9 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now,
}
SMARTLIST_FOREACH_BEGIN(voter->sigs, document_signature_t *, sig) {
- cert = authority_cert_get_by_digests(voter->identity_digest,
- sig->signing_key_digest);
+ authority_cert_t *cert =
+ authority_cert_get_by_digests(voter->identity_digest,
+ sig->signing_key_digest);
if (cert) {
if (now < cert->expires)
download_status_reset_by_sk_in_cl(cl, sig->signing_key_digest);