mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-28 14:23:30 +01:00
13 lines
459 B
Plaintext
13 lines
459 B
Plaintext
<<<<<<< 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
|