From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Dec 2013 16:42:35 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug10485'
X-Git-Tag: tor-0.2.5.2-alpha~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=573ee36eae63962f5af162a7f732fe4459513c94;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug10485'
---

573ee36eae63962f5af162a7f732fe4459513c94
diff --cc src/or/status.c
index 6e2206e5e5,134d8ee88f..415f4daea8
--- 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