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

Conflicts:
	src/or/status.c

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

diff --cc src/or/status.c
index e44de635cb9098f046995f1d51678a1164e59e7f,6a43fc4d89c035bb2f3110b86b430befe2776285..d239e6ee75469c14c32f54ca631f711f088e692c
--- 1/src/or/status.c
--- 2/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;