commit 3367a7611eb2a4fbedca568e39045971106cb315 Merge: d1dc23c 74f5e30 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 5 16:57:53 2013 -0400

Merge remote-tracking branch 'desoxy/bug-8596' into maint-0.2.4

changes/bug8596 | 3 +++ src/or/addressmap.c | 2 +- src/or/connection_edge.c | 21 +++++++++------------ src/or/control.c | 14 ++++++++------ src/or/control.h | 3 ++- 5 files changed, 23 insertions(+), 20 deletions(-)