diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-26 12:12:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-26 12:12:41 -0400 |
| commit | fc4a3b30c8e329d408eb2e6bd922f5cb8a5ff10b (patch) | |
| tree | 3ac6f40db011ea3601878932884213400156e0e2 | |
| parent | cd12ee6740a5495e5edf5ecfc7f457b1bad2efb2 (diff) | |
| parent | a873ba8edda40e4bc43e887d5f46a50eebb8b2ab (diff) | |
| download | tor-fc4a3b30c8e329d408eb2e6bd922f5cb8a5ff10b.tar.gz tor-fc4a3b30c8e329d408eb2e6bd922f5cb8a5ff10b.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -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 aa4acf6f64..01316c1bc2 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2129,7 +2129,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); @@ -2197,8 +2198,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; |