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

[nickm at torproject.org]

commit 1b026efc6275b3bbaf6f6906d5e0060272e05d15
Merge: 3dfd1eb ee3cc44
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 11 01:43:14 2013 -0400

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

 changes/bug7302  |   11 +++++++++++
 src/or/control.c |    3 +++
 src/or/status.c  |   11 +++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)