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

[nickm at torproject.org]

commit 30e933b13660e62d10997f4809b3f13235b30325
Merge: 732322b b49ffb2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 31 14:37:09 2015 -0400

    Merge branch 'ticket14710_squashed'

 changes/ticket14710     |   10 +++
 src/common/address.c    |   99 +++++++++++++++++----------
 src/common/address.h    |    3 +
 src/common/compat.c     |   20 +++++-
 src/common/compat.h     |   10 ++-
 src/test/test_address.c |  175 ++++++++++++++++++++++++++++++++++++++++++++++-
 6 files changed, 274 insertions(+), 43 deletions(-)