commit 4a7f979b54c1400190e037b818a241b92e40aabd Merge: 9eeb902 5cc322e Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 19 12:41:01 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/address.c | 2 +- src/or/routerparse.c | 4 ++-- src/test/test_addr.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)