Merge commit 'refs/pull/508/head' of github.com:bitcoindevkit/bdk

author Steve Myers <steve@notmandatory.org>

Tue, 11 Jan 2022 09:08:33 +0000 (10:08 +0100)

committer Steve Myers <steve@notmandatory.org>

Tue, 11 Jan 2022 09:08:33 +0000 (10:08 +0100)
author Steve Myers <steve@notmandatory.org>
Tue, 11 Jan 2022 09:08:33 +0000 (10:08 +0100)
committer Steve Myers <steve@notmandatory.org>
Tue, 11 Jan 2022 09:08:33 +0000 (10:08 +0100)
diff --cc CHANGELOG.md
Simple merge
diff --cc src/lib.rs
Simple merge
author	Steve Myers <steve@notmandatory.org>
	Tue, 11 Jan 2022 09:08:33 +0000 (10:08 +0100)
committer	Steve Myers <steve@notmandatory.org>
	Tue, 11 Jan 2022 09:08:33 +0000 (10:08 +0100)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history