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

[nickm at torproject.org]

commit 534acf400e017adf489dfe3eca87ad82bbc15167
Merge: 3511549 edc6fa2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 6 13:24:12 2014 -0500

    Merge branch 'bug10485_024' into maint-0.2.4

 changes/bug10485 |    4 ++++
 src/or/main.c    |    5 -----
 src/or/rephist.c |    1 -
 src/or/status.c  |    3 +++
 4 files changed, 7 insertions(+), 6 deletions(-)