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

[nickm at torproject.org]

commit 298e08132f3368514b868eecc5f44e982280010d
Merge: 77a7a98 dd68d59
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 5 10:44:48 2012 -0500

    Merge remote-tracking branch 'public/bug4760'

 changes/bug4760     |    4 ++++
 src/or/connection.c |   19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)