[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug10485'

[nickm at torproject.org]

commit 573ee36eae63962f5af162a7f732fe4459513c94
Merge: 3121a6d 2b8962b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 24 11:42:35 2013 -0500

    Merge remote-tracking branch 'public/bug10485'

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

diff --cc src/or/status.c
index 6e2206e,134d8ee..415f4da
--- a/src/or/status.c
+++ b/src/or/status.c
@@@ -14,10 -14,8 +14,11 @@@
  #include "router.h"
  #include "circuitlist.h"
  #include "main.h"
+ #include "rephist.h"
  #include "hibernate.h"
 +#include "statefile.h"
 +
 +static void log_accounting(const time_t now, const or_options_t *options);
  
  /** Return the total number of circuits. */
  static int