commit 7e1a0bb24e40bbb02a458b5a903703c065792ddc Merge: d30783e 62c1311 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 6 08:03:16 2012 -0400

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

changes/bug6218 | 3 +++ src/common/address.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)