[tor-commits] [tor/master] Merge remote-tracking branch 'asn/heartbeat'
nickm at torproject.org
nickm at torproject.org
Tue Apr 19 16:10:52 UTC 2011
commit 750b5119c056587c599c8acafcbdeb43341d1d61
Merge: c4bf7f5 c2d9d80
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue Apr 19 12:08:28 2011 -0400
Merge remote-tracking branch 'asn/heartbeat'
src/or/main.c | 9 ---------
src/or/main.h | 1 -
src/or/status.c | 6 ++----
3 files changed, 2 insertions(+), 14 deletions(-)
More information about the tor-commits
mailing list