From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Apr 2013 05:42:54 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug7302' into maint-0.2.4
X-Git-Tag: tor-0.2.5.1-alpha~219^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee3cc44f27b6620ad25a20bb16fcffe23ca66663;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug7302' into maint-0.2.4

Conflicts:
	src/or/status.c
---

ee3cc44f27b6620ad25a20bb16fcffe23ca66663
diff --cc src/or/status.c
index e44de635cb,6a43fc4d89..d239e6ee75
--- a/src/or/status.c
+++ b/src/or/status.c
@@@ -85,7 -86,7 +86,8 @@@ log_heartbeat(time_t now
    char *bw_rcvd = NULL;
    char *uptime = NULL;
    const routerinfo_t *me;
 +  double r = tls_get_write_overhead_ratio();
+   const int hibernating = we_are_hibernating();
  
    const or_options_t *options = get_options();
    (void)now;