commit 91b3fa3636eecc15688263e32133e97fcce36c93 Merge: 1c139f6 9e5a6f0 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 12 10:11:45 2016 -0500

Merge remote-tracking branch 'fergus-dall/log_heartbeat_test'

changes/log_heartbeat_test | 5 +++++ src/test/test_status.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-)