[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug14875'

[nickm@xxxxxxxxxxxxxx]

commit 5644d92dd7081e4a18d7385e68cee907ba67c451
Merge: f794a09 c8ce973
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 12 14:50:13 2015 -0500

    Merge remote-tracking branch 'sebastian/bug14875'

 src/common/address.c    |   53 +++++++++++++++++++++++++++++++----------------
 src/common/address.h    |    2 +-
 src/test/test_address.c |    4 ++--
 3 files changed, 38 insertions(+), 21 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits