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

[nickm at torproject.org]

commit 949583d9f74a7003f5780e786a253eb66f2f8f54
Merge: e3a6493 e94f7d6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 28 16:34:55 2011 -0500

    Merge branch 'bug1827_squashed'

 configure.in         |   12 ++-
 src/common/address.c |  206 +++++++++++++++++++++++++++++++++++++++++++++++++-
 src/test/test_addr.c |   11 +--
 3 files changed, 218 insertions(+), 11 deletions(-)