Merge branch 'maint-0.3.1' into maint-0.3.2

This commit is contained in:
Nick Mathewson 2018-04-16 13:48:23 -04:00
commit c5899d5cf3

View File

@ -1225,7 +1225,7 @@ tor_addr_keyed_hash(const struct sipkey *key, const tor_addr_t *addr)
/* LCOV_EXCL_START */
tor_fragile_assert();
return 0;
/* LCOV_EXCL_END */
/* LCOV_EXCL_STOP */
}
}