tor

commit c5899d5cf3a761f4049c1d6f05232731edcfeb57
parent d3ac47b4153fbe51ca63882ce63165abdf50901b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 16 Apr 2018 13:48:23 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

Diffstat:
M
src/common/address.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/address.c b/src/common/address.c
@@ -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 */
   }
 }