commit 913fbf8f2f9eea36ccef6100608295d8c8ce449a Merge: 85bb710 a1ce111 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 18 15:02:45 2015 -0500 Merge remote-tracking branch 'teor/bug17632-no-ipv4-no-localhost' changes/bug17632-no-ipv4-no-localhost | 7 ++++ src/common/address.c | 3 +- src/test/test_address.c | 65 +++++++++++++++++++++++++++++---- src/test/test_util.c | 37 +++++++++++++++---- 4 files changed, 96 insertions(+), 16 deletions(-)