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
17,853 Commits 53 Branches 631 Tags
372adfa09a143490dfc058a6e2db78ca27ef9399
Commit Graph
3 Commits
Author SHA1 Message Date
Nick Mathewson 1b93e3c6d9 Merge remote-tracking branch 'origin/maint-0.2.4' 
Conflicts:
	changes/bug10485
	src/or/rephist.c
	src/or/status.c
 2014-02-06 13:27:04 -05:00
Nick Mathewson edc6fa2570 Deliver circuit handshake counts as part of the heartbeat 
Previously, they went out once an hour, unconditionally.

Fixes 10485; bugfix on 0.2.4.17-rc.
 2014-02-06 13:03:01 -05:00
Nick Mathewson 2b8962bc64 Move onion-type stats message into heartbeat 
Fix for 10485. Fix on 0.2.4.17-alpha.
 2013-12-24 11:41:48 -05:00