[tor-commits] [tor/master] Merge branch 'bug6468_squashed'

[nickm at torproject.org]

commit 63dfc1d9b6e6d488f32c99c3ffad882f6fbe0f51
Merge: a9d5628 d9746bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 16:01:43 2012 -0400

    Merge branch 'bug6468_squashed'

 changes/bug6468     |    8 ++++++++
 src/or/connection.c |   28 ++++------------------------
 2 files changed, 12 insertions(+), 24 deletions(-)