tor

commit 633e99575ff5576ea01cc03c085b22776972bcc3
parent d1ec7bb06e41d6f4b79c5709c6d7be62393939e7
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 15 Oct 2018 12:52:54 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

Diffstat:
M
src/or/hs_intropoint.c
 | 
3
+--

1 file changed, 1 insertion(+), 2 deletions(-)
diff --git 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));
 }
-