[tor-commits] [tor/master] Merge remote branch 'sebastian/bug2660' into maint-0.2.2

[nickm at torproject.org]

commit 3bd83b8fb64c070210c589f65ed8cc023dd47077
Merge: 35fcec3 f83debb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 7 17:09:23 2011 -0500

    Merge remote branch 'sebastian/bug2660' into maint-0.2.2

 changes/bug2660      |    7 +++++++
 src/common/address.c |   18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)