commit 217862b3172490d5a620d947d7d56be47ccf1dde Merge: dc9dd23 28c42fe Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 28 10:49:32 2012 -0400

Merge remote-tracking branch 'public/bug6244_part2' into maint-0.2.3

changes/bug6244_part2 | 4 ++++ src/or/connection_edge.c | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-)