diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-01 21:49:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-01 21:49:01 -0400 |
| commit | fc9e84062b73535b63bb3cf555604b1acbcc4c61 (patch) | |
| tree | 8c47eb7b3f82bb6bf00c19481f058372fa68fd84 /src/test/test_addr.c | |
| parent | dfc32177d9ec3b8a639d6831ca4bc92c4f273dcb (diff) | |
| parent | 408bd98e79196933e447cbc68c73ecffebaf5a19 (diff) | |
| download | tor-fc9e84062b73535b63bb3cf555604b1acbcc4c61.tar.gz tor-fc9e84062b73535b63bb3cf555604b1acbcc4c61.zip | |
Merge remote-tracking branch 'public/bug4645'
Conflicts:
src/or/dirserv.c
Diffstat (limited to 'src/test/test_addr.c')
| -rw-r--r-- | src/test/test_addr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 036380fe85..1c2a90e1ec 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -402,7 +402,6 @@ test_addr_ip6_helpers(void) test_internal_ip("::ffff:169.254.0.0", 0); test_internal_ip("::ffff:169.254.255.255", 0); test_external_ip("::ffff:169.255.0.0", 0); - test_assert(is_internal_IP(0x7f000001, 0)); /* tor_addr_compare(tor_addr_t x2) */ test_addr_compare("ffff::", ==, "ffff::0"); |