commit 45f30ba5faf1c27fd8404c2fb95b1a79b9f59984 Merge: 05018d55c 63b404911 Author: teor teor@torproject.org Date: Fri Aug 9 13:53:34 2019 +1000

Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9

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