[tor-commits] [tor/master] Merge remote-tracking branch 'fergus-dall/log_heartbeat_test'

[nickm@xxxxxxxxxxxxxx]

commit 91b3fa3636eecc15688263e32133e97fcce36c93
Merge: 1c139f6 9e5a6f0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
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(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits