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

[nickm at torproject.org]

commit ab3d5c049032651a9c9164262f9a8f81de9709d4
Merge: 1b5320b e35ca13
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 18 21:42:39 2013 -0400

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

 changes/bug8716  |    3 +++
 src/or/config.c  |    3 ++-
 src/or/control.c |    2 +-
 src/or/control.h |    2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)