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

[nickm at torproject.org]

commit fc0842275de8f8ab43374df922907d97b4e60b58
Merge: d1bbd84 9d41629
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 31 15:07:19 2012 -0400

    Merge remote-tracking branch 'public/bug5374'

 changes/bug5374     |    7 +++++++
 src/or/connection.c |   11 ++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)