[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 7ccaf3f1a485ece89e6bf27e419f16dc9e88d891
Merge: e755e14 2c15506
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 2 10:37:00 2013 -0400

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

 changes/bug8427     |    5 +++++
 src/or/connection.c |    4 ++++
 2 files changed, 9 insertions(+), 0 deletions(-)