commit ee3cc44f27b6620ad25a20bb16fcffe23ca66663 Merge: 7f50af1 805ecb8 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 11 01:42:54 2013 -0400 Merge remote-tracking branch 'public/bug7302' into maint-0.2.4 Conflicts: src/or/status.c changes/bug7302 | 11 +++++++++++ src/or/control.c | 3 +++ src/or/status.c | 11 +++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --cc src/or/status.c index e44de63,6a43fc4..d239e6e --- 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;