[tor-commits] [tor/master] Merge branch 'bug30721_squashed'

[nickm at torproject.org]

commit 089ef46063f49d9a0c8a4ebfdcf5ac2ca0bf5a1e
Merge: c2a326d34 6ef555bda
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 26 09:57:20 2019 -0400

    Merge branch 'bug30721_squashed'

 changes/bug30721                         |  10 +
 scripts/maint/practracker/exceptions.txt |   1 -
 src/lib/net/address.c                    | 110 +++--
 src/lib/net/resolve.c                    | 339 ++++++++++------
 src/test/test_addr.c                     | 675 +++++++++++++++++++++++++------
 5 files changed, 851 insertions(+), 284 deletions(-)