commit 1a9555e28352c0807527126a2e5b3fd6b95fe8a0 Merge: 6205810f8 08ddf1f62 Author: teor teor@torproject.org Date: Fri Aug 9 13:53:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5

changes/bug28525 | 8 ++++++++ src/lib/net/address.c | 19 +++++++++++++++---- src/test/test_addr.c | 18 ++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-)