diff options
Diffstat (limited to 'changes/bug10485')
| -rw-r--r-- | changes/bug10485 | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/changes/bug10485 b/changes/bug10485 deleted file mode 100644 index d2b3d8be0..000000000 --- a/changes/bug10485 +++ /dev/null @@ -1,12 +0,0 @@ -<<<<<<< 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 |