[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[arma at torproject.org]

commit b4b14921da4a81b5ed2cdafd5b7ff230b298edd4
Merge: a7958a7 607b29a
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Jun 10 15:01:25 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

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