Merge branch 'maint-0.3.3' into release-0.3.3

This commit is contained in:
Nick Mathewson 2018-05-22 08:35:41 -04:00
commit c91c4e9bb6
2 changed files with 6 additions and 1 deletions

4
changes/bug25415 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (directory authority):
- Avoid a crash when testing router reachability on a router that could
have an ed25519 ID, but which does not. Fixes bug 25415; bugfix on
0.3.3.2-alpha.

View File

@ -3402,7 +3402,8 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router)
tor_assert(node);
if (options->AuthDirTestEd25519LinkKeys &&
node_supports_ed25519_link_authentication(node, 1)) {
node_supports_ed25519_link_authentication(node, 1) &&
router->cache_info.signing_key_cert) {
ed_id_key = &router->cache_info.signing_key_cert->signing_key;
} else {
ed_id_key = NULL;