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

[nickm at torproject.org]

commit a0f051137de293342d692df1d2cfa1386e5e7769
Merge: 26990f3ad 24ba5fd74
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 8 20:09:42 2018 -0400

    Merge branch 'ticket25993_squashed'

 changes/ticket25993  |   4 ++
 src/or/addressmap.c  |   4 ++
 src/test/test_addr.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 162 insertions(+)