Merge pull request #6766 from opensourcerouting/xref

author Russ White <russ@riw.us>

Tue, 2 Feb 2021 12:44:21 +0000 (07:44 -0500)

committer GitHub <noreply@github.com>

Tue, 2 Feb 2021 12:44:21 +0000 (07:44 -0500)
author Russ White <russ@riw.us>
Tue, 2 Feb 2021 12:44:21 +0000 (07:44 -0500)
committer GitHub <noreply@github.com>
Tue, 2 Feb 2021 12:44:21 +0000 (07:44 -0500)
diff --cc lib/log.c
Simple merge
diff --cc lib/thread.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 2 Feb 2021 12:44:21 +0000 (07:44 -0500)
committer	GitHub <noreply@github.com>
	Tue, 2 Feb 2021 12:44:21 +0000 (07:44 -0500)
		1	2
lib/log.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/thread.c	patch \|	diff1 \|	diff2 \|	blob \| history