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

[nickm at torproject.org]

commit c8c258a4333815e195097a59801397dd7a169828
Merge: ca1d1c382 519fa1a3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 10 12:57:23 2018 -0500

    Merge branch 'bug24733_squashed_2'

 changes/bug24733     |  6 ++++++
 src/common/address.c | 14 +++++++++++++-
 src/common/util.h    |  5 +++++
 3 files changed, 24 insertions(+), 1 deletion(-)