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

[nickm at torproject.org]

commit 0073c5b517c7e42188214fa5b8c7b61fac6ba248
Merge: e74c360 9815029
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 4 15:12:45 2014 -0400

    Merge remote-tracking branch 'andrea/bug10616'

 changes/bug10616         |    4 ++++
 src/or/connection_edge.c |   22 +++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)