[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[arma at torproject.org]

commit 607b29ae1abe7da7d06e4e9282ed88a2dd7fe8d4
Merge: c860a96 4835fae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 10 12:26:39 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

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