diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-02-12 03:59:59 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-02-12 03:59:59 -0500 |
| commit | 7c39bf0e447a456a9999b3de95ed17fa0e86f157 (patch) | |
| tree | 2befb835b53e0638f54d986d23311003996b2724 /changes/bug10485 | |
| parent | 0ee449ca92dc7f25517a63b63f4d521fdd48410b (diff) | |
| download | tor-7c39bf0e447a456a9999b3de95ed17fa0e86f157.tar tor-7c39bf0e447a456a9999b3de95ed17fa0e86f157.tar.gz | |
go through and rewrite the changes files to be more user-facing
Diffstat (limited to 'changes/bug10485')
| -rw-r--r-- | changes/bug10485 | 8 |
1 files changed, 0 insertions, 8 deletions
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 |