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 | 5e0fbd7006993a4e402f2eee49f6f86074923197 (patch) | |
| tree | ebab109178b6f688f7d579d2ee155c97a60f9b43 /src | |
| parent | db6902c23530f8d58e999701685e9cbd74b15a82 (diff) | |
| parent | 0e13ff48155ca8cda7483afe730652bed61ba5a0 (diff) | |
| download | tor-5e0fbd7006993a4e402f2eee49f6f86074923197.tar.gz tor-5e0fbd7006993a4e402f2eee49f6f86074923197.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.1
Diffstat (limited to 'src')
| -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 e6b437e9dd..555f63da06 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1223,7 +1223,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 */ } } |