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

[nickm at torproject.org]

commit 383b44553c433cefc70c4f413ad48efc87f9bbea
Merge: a2e034d7d e9adc200a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 31 11:07:15 2018 -0400

    Merge branch 'ticket24393_036_01_squashed'

 changes/bug24393                |  6 ++++
 src/feature/nodelist/nodelist.c | 18 ++++++++--
 src/test/test_address.c         | 75 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 2 deletions(-)