Merge branch 'stable'

author Kevin McCarthy <kevin@8t8.us>

Tue, 10 Sep 2019 01:07:16 +0000 (18:07 -0700)

committer Kevin McCarthy <kevin@8t8.us>

Tue, 10 Sep 2019 01:07:16 +0000 (18:07 -0700)
author Kevin McCarthy <kevin@8t8.us>
Tue, 10 Sep 2019 01:07:16 +0000 (18:07 -0700)
committer Kevin McCarthy <kevin@8t8.us>
Tue, 10 Sep 2019 01:07:16 +0000 (18:07 -0700)
diff --cc configure.ac
Simple merge
diff --cc monitor.h
Simple merge
author	Kevin McCarthy <kevin@8t8.us>
	Tue, 10 Sep 2019 01:07:16 +0000 (18:07 -0700)
committer	Kevin McCarthy <kevin@8t8.us>
	Tue, 10 Sep 2019 01:07:16 +0000 (18:07 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
monitor.h	patch \|	diff1 \|	diff2 \|	blob \| history