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

[nickm at torproject.org]

commit 74ddd5f739696749409c933f82cf3a93152da6cc
Merge: 10174b0 f36e932
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 16 23:13:27 2014 -0400

    Merge remote-tracking branch 'andrea/bug11306'

 changes/bug11306    |    4 ++++
 src/or/config.c     |    5 ++++-
 src/or/connection.c |   14 ++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)