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

[nickm at torproject.org]

commit 084924360aa937014aa4b86de1131e0a413e81de
Merge: c19bb4d62 1425549ca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 30 09:05:42 2018 -0400

    Merge branch 'ticket23082_squashed'

 changes/bug23082      |  4 ++++
 src/lib/net/address.c | 12 +++++++++--
 src/lib/net/inaddr.c  |  8 +++++++-
 src/test/test_addr.c  | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/test/test_util.c  | 13 ++++++++++++
 5 files changed, 89 insertions(+), 4 deletions(-)