[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/bug11302'

[nickm at torproject.org]

commit b408125288ad6943d7ed3b468ad9179a93d1359c
Merge: 0ef5d4d 65a0f89
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 16 16:58:41 2014 +0200

    Merge remote-tracking branch 'andrea/bug11302'

 changes/bug11302    |    4 ++++
 src/or/connection.c |   12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)