commit 0920cd02f4c49b64d30879b18c4287384a36d9f1 Merge: cd10013 b701560 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 2 15:38:29 2011 -0500

Merge remote-tracking branch 'origin/maint-0.2.2'

changes/bug4530 | 6 ++++++ src/common/address.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)