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