commit 59a162f7d2048bc5e6bbc953c2bdc76a0367221b Merge: 2c956f0 b9f6e40 Author: Nick Mathewson nickm@torproject.org Date: Sun Dec 22 17:20:22 2013 -0500

Merge branch 'bug10465' into maint-0.2.4

changes/bug10465 | 3 +++ src/or/connection_edge.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-)