Merge pull request #4096 from donaldsharp/pim_nht_cleanup

author Russ White <russ@riw.us>

Tue, 16 Apr 2019 14:27:35 +0000 (10:27 -0400)

committer GitHub <noreply@github.com>

Tue, 16 Apr 2019 14:27:35 +0000 (10:27 -0400)
author Russ White <russ@riw.us>
Tue, 16 Apr 2019 14:27:35 +0000 (10:27 -0400)
committer GitHub <noreply@github.com>
Tue, 16 Apr 2019 14:27:35 +0000 (10:27 -0400)
diff --cc pimd/pim_cmd.c
Simple merge
diff --cc pimd/pim_upstream.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 16 Apr 2019 14:27:35 +0000 (10:27 -0400)
committer	GitHub <noreply@github.com>
	Tue, 16 Apr 2019 14:27:35 +0000 (10:27 -0400)
		1	2
pimd/pim_cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_upstream.c	patch \|	diff1 \|	diff2 \|	blob \| history