Move onion-type stats message into heartbeat

Fix for 10485. Fix on 0.2.4.17-alpha.
Merge remote-tracking branch 'public/bug10485'