diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-15 12:52:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-15 12:52:54 -0400 |
| commit | 633e99575ff5576ea01cc03c085b22776972bcc3 (patch) | |
| tree | d4b5ed9e2e7f26a51ff6c0ea534f12cbe6f09011 | |
| parent | d1ec7bb06e41d6f4b79c5709c6d7be62393939e7 (diff) | |
| parent | 6b2ef2c5597a9e481939e04b556566c8b6283e46 (diff) | |
| download | tor-633e99575ff5576ea01cc03c085b22776972bcc3.tar.gz tor-633e99575ff5576ea01cc03c085b22776972bcc3.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
| -rw-r--r-- | src/or/hs_intropoint.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 3274e8e9c0..ee79109ca9 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -58,7 +58,7 @@ get_auth_key_from_cell(ed25519_public_key_t *auth_key_out, default: /* Getting here is really bad as it means we got a unknown cell type from * this file where every call has an hardcoded value. */ - tor_assert(0); /* LCOV_EXCL_LINE */ + tor_assert_unreached(); /* LCOV_EXCL_LINE */ } tor_assert(key_array); tor_assert(auth_key_len == sizeof(auth_key_out->pubkey)); @@ -609,4 +609,3 @@ hs_intropoint_clear(hs_intropoint_t *ip) smartlist_free(ip->link_specifiers); memset(ip, 0, sizeof(hs_intropoint_t)); } - |