Merge remote-tracking branch 'public/bug10485'

diff --cc src/or/main.c
Simple merge

diff --cc src/or/rephist.c
Simple merge

diff --cc src/or/status.c
index 6e2206e5e59a9ec6aa766e4f1bb9aa65923f0f3c,134d8ee88fde7052d63d7e25ad8ffeb2bc614bfb..415f4daea89cd754b11cfca17d618924e94a3494
--- 1/src/or/status.c
--- 2/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