commit 8592126a184c5f80e3213085d666362f21320df0 Merge: 9292a78 b6b7efc Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 14 12:53:34 2011 -0500 Merge remote-tracking branch '4ZM/topic/test/4433_address' src/common/address.c | 14 +++++++++----- src/test/test_addr.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 5 deletions(-)