Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2018-04-16 13:48:23 -04:00
commit b83991fce3
1 changed files with 2 additions and 2 deletions

View File

@ -1199,7 +1199,7 @@ tor_addr_hash(const tor_addr_t *addr)
/* LCOV_EXCL_START */
tor_fragile_assert();
return 0;
/* LCOV_EXCL_END */
/* LCOV_EXCL_STOP */
}
}
@ -1221,7 +1221,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 */
}
}