bug10485 459 B

123456789101112
  1. <<<<<<< HEAD
  2. o Minor bugfixes:
  3. - Turn "circuit handshake stats since last time" log messages into a
  4. heartbeat message. Fixes bug 10485; bugfix on 0.2.4.17-rc.
  5. ||||||| merged common ancestors
  6. =======
  7. o Minor bugfixes:
  8. - Move message about circuit handshake counts into the heartbeat
  9. message where it belongs, instead of logging it once per hour
  10. unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc.
  11. >>>>>>> origin/maint-0.2.4