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

author Steve Myers <steve@notmandatory.org>

Tue, 13 Jul 2021 22:12:53 +0000 (15:12 -0700)

committer Steve Myers <steve@notmandatory.org>

Tue, 13 Jul 2021 22:12:53 +0000 (15:12 -0700)
author Steve Myers <steve@notmandatory.org>
Tue, 13 Jul 2021 22:12:53 +0000 (15:12 -0700)
committer Steve Myers <steve@notmandatory.org>
Tue, 13 Jul 2021 22:12:53 +0000 (15:12 -0700)
diff --cc .github/workflows/cont_integration.yml
Simple merge
diff --cc Cargo.toml
Simple merge
diff --cc src/blockchain/rpc.rs
Simple merge
author	Steve Myers <steve@notmandatory.org>
	Tue, 13 Jul 2021 22:12:53 +0000 (15:12 -0700)
committer	Steve Myers <steve@notmandatory.org>
	Tue, 13 Jul 2021 22:12:53 +0000 (15:12 -0700)
		1	2
.github/workflows/cont_integration.yml	patch \|	diff1 \|	diff2 \|	blob \| history
Cargo.toml	patch \|	diff1 \|	diff2 \|	blob \| history
src/blockchain/rpc.rs	patch \|	diff1 \|	diff2 \|	blob \| history