commit ebb95d0f781e21a694a8de386ed0b75984b247d4 Merge: c6ca199 165b2c0 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 18 15:27:50 2013 -0400

Merge remote-tracking branch 'public/bug8377' into maint-0.2.3

changes/bug8377 | 3 +++ src/common/address.c | 3 ++- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-)