commit 29db095a35db715f1d84aacae24f00b54aad2507 Merge: 9da99b4 3ebe960 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 30 12:41:08 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4529 | 5 +++++ src/common/address.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)