Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

author Quanah Gibson-Mount <quanah@openldap.org>

Thu, 1 Apr 2021 02:03:22 +0000 (02:03 +0000)

committer Quanah Gibson-Mount <quanah@openldap.org>

Thu, 1 Apr 2021 02:03:22 +0000 (02:03 +0000)
author Quanah Gibson-Mount <quanah@openldap.org>
Thu, 1 Apr 2021 02:03:22 +0000 (02:03 +0000)
committer Quanah Gibson-Mount <quanah@openldap.org>
Thu, 1 Apr 2021 02:03:22 +0000 (02:03 +0000)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Quanah Gibson-Mount <quanah@openldap.org>
	Thu, 1 Apr 2021 02:03:22 +0000 (02:03 +0000)
committer	Quanah Gibson-Mount <quanah@openldap.org>
	Thu, 1 Apr 2021 02:03:22 +0000 (02:03 +0000)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history