commit 41ce34e2109ac22a92ce2975a932b6f0f83c1efe Merge: 786a854 3e61d45 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 13 10:53:03 2012 -0500

Merge branch 'heartbeat_rebased_again'

Makefile.am | 2 + src/main.c | 24 +++++++++++ src/network.c | 3 + src/status.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/status.h | 13 ++++++ 5 files changed, 161 insertions(+), 0 deletions(-)