[tor-commits] [tor/master] Merge remote-tracking branch '4ZM/topic/test/4434_address'

[nickm at torproject.org]

commit d348cfdbdfa2c54e646e95e3690d8f6848e779b2
Merge: 8d6ce16 ca1e88a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 11 11:07:29 2011 -0500

    Merge remote-tracking branch '4ZM/topic/test/4434_address'

 src/common/address.c |   10 +++++-
 src/common/compat.c  |    4 +-
 src/test/test_addr.c |   71 +++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 78 insertions(+), 7 deletions(-)