[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug14391_026_v2'

[nickm at torproject.org]

commit 8837cc266e44f8033f32a7d1a05020e585f034c7
Merge: 7e6437b 91009dc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 15 10:33:04 2015 -0400

    Merge remote-tracking branch 'dgoulet/bug14391_026_v2'

 src/or/connection_edge.c |   59 +++++++++++++++++++++++++-----------------
 src/or/rendclient.c      |   56 ++++++++++++++++++++++++++--------------
 src/or/rendcommon.c      |   64 +++++++++++++++++++++++++++++-----------------
 3 files changed, 113 insertions(+), 66 deletions(-)