[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug3728'

[nickm at torproject.org]

commit 2dc40b9c49ec13ed24b5a541ce6cfecfe79effbf
Merge: aeb2752 ec8d0a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 15 11:06:50 2011 -0400

    Merge remote-tracking branch 'asn/bug3728'

 src/or/connection.c |   74 +++++++++++++++++++++++++++------------------------
 1 files changed, 39 insertions(+), 35 deletions(-)