[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/feature17950'

[nickm at torproject.org]

commit d10ea49588701b29148a27c87701961227d63ba9
Merge: 8fc27ac fd26c1d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 11 08:54:51 2016 -0500

    Merge remote-tracking branch 'rl1987/feature17950'

 changes/feature17950    |    5 +++++
 src/common/address.c    |   46 +++++++++++++++++++++++++++-------------------
 src/common/address.h    |   15 ++++++++++-----
 src/test/test_address.c |   11 ++++++-----
 4 files changed, 48 insertions(+), 29 deletions(-)