From 7c39bf0e447a456a9999b3de95ed17fa0e86f157 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Wed, 12 Feb 2014 03:59:59 -0500 Subject: go through and rewrite the changes files to be more user-facing --- changes/bug10485 | 8 -------- 1 file changed, 8 deletions(-) (limited to 'changes/bug10485') diff --git a/changes/bug10485 b/changes/bug10485 index d2b3d8be0..aa599fba7 100644 --- a/changes/bug10485 +++ b/changes/bug10485 @@ -1,12 +1,4 @@ -<<<<<<< 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 -- cgit v1.2.3