From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Oct 2015 13:32:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'twstrike/procmon_tests'
X-Git-Tag: tor-0.2.8.1-alpha~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cec2bc435ed252389d80d77ab17ba4de33ae3153;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'twstrike/procmon_tests'

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

cec2bc435ed252389d80d77ab17ba4de33ae3153