diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-06 13:27:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-06 13:27:04 -0500 |
| commit | 1b93e3c6d9802d64db7ce752717cf02ed35d1b60 (patch) | |
| tree | 8854ce58c05cb1faf4820ab6ac9ad97815fce0b1 /changes | |
| parent | 34740a17ea8145f7d308991b710e759b90a0d87b (diff) | |
| parent | 655adbf6677fde28ba37f029701083901eda7efd (diff) | |
| download | tor-1b93e3c6d9802d64db7ce752717cf02ed35d1b60.tar.gz tor-1b93e3c6d9802d64db7ce752717cf02ed35d1b60.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
changes/bug10485
src/or/rephist.c
src/or/status.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug10485 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug10485 b/changes/bug10485 index aa599fba72..d2b3d8be0b 100644 --- a/changes/bug10485 +++ b/changes/bug10485 @@ -1,4 +1,12 @@ +<<<<<<< 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 |