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

author Steve Myers <steve@notmandatory.org>

Thu, 23 Sep 2021 22:28:57 +0000 (15:28 -0700)

committer Steve Myers <steve@notmandatory.org>

Thu, 23 Sep 2021 22:28:57 +0000 (15:28 -0700)
author Steve Myers <steve@notmandatory.org>
Thu, 23 Sep 2021 22:28:57 +0000 (15:28 -0700)
committer Steve Myers <steve@notmandatory.org>
Thu, 23 Sep 2021 22:28:57 +0000 (15:28 -0700)
diff --cc CHANGELOG.md
Simple merge
diff --cc Cargo.toml
Simple merge
author	Steve Myers <steve@notmandatory.org>
	Thu, 23 Sep 2021 22:28:57 +0000 (15:28 -0700)
committer	Steve Myers <steve@notmandatory.org>
	Thu, 23 Sep 2021 22:28:57 +0000 (15:28 -0700)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
Cargo.toml	patch \|	diff1 \|	diff2 \|	blob \| history