Merge pull request #76 from painless-security/jennifer/trpc_deadlock

author mrw42 <margaret@painless-security.com>

Fri, 4 May 2018 20:58:06 +0000 (16:58 -0400)

committer GitHub <noreply@github.com>

Fri, 4 May 2018 20:58:06 +0000 (16:58 -0400)
author mrw42 <margaret@painless-security.com>
Fri, 4 May 2018 20:58:06 +0000 (16:58 -0400)
committer GitHub <noreply@github.com>
Fri, 4 May 2018 20:58:06 +0000 (16:58 -0400)
diff --cc tr/tr_trp.c
Simple merge
diff --cc trp/trps.c
Simple merge
author	mrw42 <margaret@painless-security.com>
	Fri, 4 May 2018 20:58:06 +0000 (16:58 -0400)
committer	GitHub <noreply@github.com>
	Fri, 4 May 2018 20:58:06 +0000 (16:58 -0400)
		1	2
tr/tr_trp.c	patch \|	diff1 \|	diff2 \|	blob \| history
trp/trps.c	patch \|	diff1 \|	diff2 \|	blob \| history