[tor-commits] [tor/master] Merge branch 'bug9017' into maint-0.2.3

[nickm at torproject.org]

commit 4835faebf533f93eb390649dfcb5c8cc0289e3d3
Merge: fe689de 77a1935
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 10 12:25:14 2013 -0400

    Merge branch 'bug9017' into maint-0.2.3

 changes/bug9017          |    6 ++++++
 src/or/connection_edge.c |   11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)