[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug5537'

[nickm at torproject.org]

commit 3e4ccbc4ba748b76c2e8d3c0d99b48191c01d1e4
Merge: da820bb a74905c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 11:05:50 2012 -0400

    Merge remote-tracking branch 'public/bug5537'

 changes/bug5537     |    5 ++++
 src/or/connection.c |   65 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 47 insertions(+), 23 deletions(-)