torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'twstrike/procmon_tests'

Browse Source 
Conflicts:
	src/test/include.am
	src/test/log_test_helpers.c
	src/test/log_test_helpers.h
This commit is contained in:
Nick Mathewson
2015-10-07 09:32:51 -04:00
parent 15bfdbeb9d ca927b7f63
commit cec2bc435e
4 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/include.am
+1
View File
@@ -86,6 +86,7 @@ src_test_test_SOURCES = \
src/test/test_oom.c \
src/test/test_options.c \
src/test/test_policy.c \
src/test/test_procmon.c \
src/test/test_pt.c \
src/test/test_relay.c \
src/test/test_relaycell.c \