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

[nickm at torproject.org]

commit c856193199151bf26208981f63ca723f9c4cf5d6
Merge: 74ddd5f 6ee9138
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 16 23:13:30 2014 -0400

    Merge remote-tracking branch 'andrea/bug11304'

 changes/bug11304    |    5 +++++
 src/or/connection.c |    6 ++++++
 2 files changed, 11 insertions(+)