tor/changes/bug10485

<<<<<<< HEAD
  o Minor bugfixes:
    - Turn "circuit handshake stats since last time" log messages into a
      heartbeat message. Fixes bug 10485; bugfix on 0.2.4.17-rc.

||||||| merged common ancestors
=======
  o Minor bugfixes:
    - Move message about circuit handshake counts into the heartbeat
      message where it belongs, instead of logging it once per hour
      unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc.
>>>>>>> origin/maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4' Conflicts: changes/bug10485 src/or/rephist.c src/or/status.c 2014-02-06 19:27:04 +01:00			`<<<<<<< HEAD`
Move onion-type stats message into heartbeat Fix for 10485. Fix on 0.2.4.17-alpha. 2013-12-24 17:41:48 +01:00			`o Minor bugfixes:`
			`- Turn "circuit handshake stats since last time" log messages into a`
			`heartbeat message. Fixes bug 10485; bugfix on 0.2.4.17-rc.`

Merge remote-tracking branch 'origin/maint-0.2.4' Conflicts: changes/bug10485 src/or/rephist.c src/or/status.c 2014-02-06 19:27:04 +01:00			`\|\|\|\|\|\|\| merged common ancestors`
			`=======`
Deliver circuit handshake counts as part of the heartbeat Previously, they went out once an hour, unconditionally. Fixes 10485; bugfix on 0.2.4.17-rc. 2014-02-06 19:03:01 +01:00			`o Minor bugfixes:`
			`- Move message about circuit handshake counts into the heartbeat`
			`message where it belongs, instead of logging it once per hour`
			`unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc.`
Merge remote-tracking branch 'origin/maint-0.2.4' Conflicts: changes/bug10485 src/or/rephist.c src/or/status.c 2014-02-06 19:27:04 +01:00			`>>>>>>> origin/maint-0.2.4`