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

author Steve Myers <steve@notmandatory.org>

Tue, 13 Jul 2021 23:10:30 +0000 (16:10 -0700)

committer Steve Myers <steve@notmandatory.org>

Tue, 13 Jul 2021 23:10:30 +0000 (16:10 -0700)
author Steve Myers <steve@notmandatory.org>
Tue, 13 Jul 2021 23:10:30 +0000 (16:10 -0700)
committer Steve Myers <steve@notmandatory.org>
Tue, 13 Jul 2021 23:10:30 +0000 (16:10 -0700)
diff --cc Cargo.toml
Simple merge
diff --cc src/lib.rs
Simple merge
author	Steve Myers <steve@notmandatory.org>
	Tue, 13 Jul 2021 23:10:30 +0000 (16:10 -0700)
committer	Steve Myers <steve@notmandatory.org>
	Tue, 13 Jul 2021 23:10:30 +0000 (16:10 -0700)
		1	2
Cargo.toml	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history