19 Apr
2011
19 Apr
'11
4:10 p.m.
commit 750b5119c056587c599c8acafcbdeb43341d1d61 Merge: c4bf7f5 c2d9d80 Author: Nick Mathewson nickm@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(-)