[tor-commits] [tor/master] Merge remote-tracking branch 'asn-mytor/heartbeat'

[nickm at torproject.org]

commit f11c269ed690b2197bad6285d614fe161a0a03bc
Merge: 600744b ce3b553
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 15 11:07:06 2011 -0400

    Merge remote-tracking branch 'asn-mytor/heartbeat'

 src/or/status.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)