torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source 
Conflicts:
	changes/bug10485
	src/or/rephist.c
	src/or/status.c
This commit is contained in:
Nick Mathewson
2014-02-06 13:27:04 -05:00
parent 34740a17ea 655adbf667
commit 1b93e3c6d9
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug10485
+8
View File
@@ -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