commit cec2bc435ed252389d80d77ab17ba4de33ae3153 Merge: 15bfdbe ca927b7 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 09:32:51 2015 -0400

Merge remote-tracking branch 'twstrike/procmon_tests'

Conflicts: src/test/include.am src/test/log_test_helpers.c src/test/log_test_helpers.h

src/common/procmon.c | 4 ++-- src/test/include.am | 1 + src/test/test.c | 3 ++- src/test/test_procmon.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 3 deletions(-)