commit ce43072831250eb5e0a089bd2cf092c34701eebf Merge: 9f7be02 59a162f Author: Roger Dingledine arma@torproject.org Date: Sun Dec 22 18:31:50 2013 -0500

Merge branch 'maint-0.2.4' into release-0.2.4

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