diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-26 12:12:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-26 12:12:54 -0400 |
| commit | 8c1c71aa2c941d7defd8874f49e541b0f185f6b3 (patch) | |
| tree | c2132aa7905ecb930427a2c0c6471b95aa01476e /src/or | |
| parent | b7fac185a6c1b5b3543624234fc83a603e89af8d (diff) | |
| parent | a873ba8edda40e4bc43e887d5f46a50eebb8b2ab (diff) | |
| download | tor-8c1c71aa2c941d7defd8874f49e541b0f185f6b3.tar.gz tor-8c1c71aa2c941d7defd8874f49e541b0f185f6b3.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/router.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/router.c b/src/or/router.c index 0a378a6711..43157a9070 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2130,7 +2130,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) ei->cache_info.is_extrainfo = 1; strlcpy(ei->nickname, get_options()->Nickname, sizeof(ei->nickname)); ei->cache_info.published_on = ri->cache_info.published_on; - ei->cache_info.signing_key_cert = tor_cert_dup(get_master_signing_key_cert()); + ei->cache_info.signing_key_cert = + tor_cert_dup(get_master_signing_key_cert()); memcpy(ei->cache_info.identity_digest, ri->cache_info.identity_digest, DIGEST_LEN); @@ -2198,8 +2199,9 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) ri->cache_info.signed_descriptor_digest); if (ei) { - tor_assert(! routerinfo_incompatible_with_extrainfo(ri->identity_pkey, ei, - &ri->cache_info, NULL)); + tor_assert(! + routerinfo_incompatible_with_extrainfo(ri->identity_pkey, ei, + &ri->cache_info, NULL)); } *r = ri; |