Merge pull request #10216 from rgacogne/shared-lock

author Remi Gacogne <remi.gacogne@powerdns.com>

Wed, 31 Mar 2021 09:28:22 +0000 (11:28 +0200)

committer GitHub <noreply@github.com>

Wed, 31 Mar 2021 09:28:22 +0000 (11:28 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Wed, 31 Mar 2021 09:28:22 +0000 (11:28 +0200)
committer GitHub <noreply@github.com>
Wed, 31 Mar 2021 09:28:22 +0000 (11:28 +0200)
diff --cc pdns/libssl.cc
Simple merge
diff --cc pdns/libssl.hh
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Wed, 31 Mar 2021 09:28:22 +0000 (11:28 +0200)
committer	GitHub <noreply@github.com>
	Wed, 31 Mar 2021 09:28:22 +0000 (11:28 +0200)
		1	2
pdns/libssl.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/libssl.hh	patch \|	diff1 \|	diff2 \|	blob \| history