commit a925fc918975fd62581d438eec0dc8a1d53ce127 Merge: a3046fd 433d757 Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 16 11:10:09 2012 -0400 Merge remote-tracking branch 'public/bug2822' changes/bug2822.1 | 5 +++++ changes/bug2822.2 | 6 ++++++ src/common/address.c | 9 +++++++++ src/common/address.h | 2 ++ src/or/connection_edge.c | 33 ++++++++++++++++++++++++--------- 5 files changed, 46 insertions(+), 9 deletions(-)