diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-04-16 13:48:23 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-04-16 13:48:23 -0400 |
commit | c5899d5cf3a761f4049c1d6f05232731edcfeb57 (patch) | |
tree | 08fb1eaeaaa7a4b87fcfc19482282be53d1286f2 /src/common/address.c | |
parent | d3ac47b4153fbe51ca63882ce63165abdf50901b (diff) | |
parent | 5e0fbd7006993a4e402f2eee49f6f86074923197 (diff) | |
download | tor-c5899d5cf3a761f4049c1d6f05232731edcfeb57.tar.gz tor-c5899d5cf3a761f4049c1d6f05232731edcfeb57.zip |
Merge branch 'maint-0.3.1' into maint-0.3.2
Diffstat (limited to 'src/common/address.c')
-rw-r--r-- | src/common/address.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/address.c b/src/common/address.c index c683e90aac..c7aa97bfd1 100644 --- 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 */ } } |