make heartbeat messages describe hibernation consistently

If user have configured hibernation it looks like this:

03:02:02.000 [notice] Bandwidth soft limit reached; commencing hibernation. No new connections will be accepted
06:19:04.000 [notice] Heartbeat: Tor's uptime is 18:00 hours, with 1 circuits open. I've sent 1.43 GB and received 1.45 GB. We are currently hibernating.
08:00:00.000 [notice] Configured hibernation.  This interval began at 2013-06-20 08:00:00; the scheduled wake-up time was 2013-06-20 08:00:00; we expect to exhaust our quota for this interval around 2013-06-21 08:00:00; the next interval begins at 2013-06-21 08:00:00 (all times local)
08:00:00.000 [notice] Hibernation period ended. Resuming normal activity.
12:19:04.000 [notice] Heartbeat: Tor's uptime is 4:19 hours, with 45 circuits open. I've sent 1.58 GB and received 1.60 GB.

This is inconsistent. Upon hibernating Tor uptime is reset, but transferred GB are not. This does not make these messages useful.

It would be best to reset bw info on uptime reset after hibernation ended or report totals and current periods.

For example Running for XX hours (not reset on hibernation), total sent/received. Uptime is YY hours, sent/received data since last start.

If user have configured hibernation, i presume that he wants to know data sent/received in last hibernation interval.

Trac:
Username: hsn