commit 671c5dcde35d404b53d959f41d52bfdc503a06d6 Merge: 0fbe1a2 159a806 Author: Nick Mathewson <nickm@torproject.org> Date: Tue May 30 10:27:37 2017 -0400 Merge remote-tracking branch 'public/bug6298' changes/bug6298 | 4 ++++ src/test/test_addr.c | 24 +++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-)