commit 24c4b56a39551ba46ba5d0c9d0ebfbce4c12f378 Merge: da908a5 60abc48 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 2 15:45:20 2014 -0400

Merge remote-tracking branch 'public/bug10081'

changes/bug10081 | 5 +++++ src/or/connection.c | 33 ++++++++++++++++++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-)