Merge branch 'master' into make_txbuilder_take_ref_to_wallet

diff --cc CHANGELOG.md
index 0dd29e754982a98222039fb68b313b05199df799,1b1108de5e441d3aacca77e05ed5cae83a5c7502..491db6ed5472a7f3ba0fe841c3c7d7c5f1a3f90d
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,17 -19,7 +19,18 @@@ and this project adheres to [Semantic V
  #### Changed
  - Remove `BlockchainMarker`, `OfflineClient` and `OfflineWallet` in favor of just using the unit
    type to mark for a missing client.
+ - Upgrade `tokio` to `1.0`.
 +  
 +#### Transaction Creation Overhaul
 +
 +The `TxBuilder` is now created from the `build_tx` or `build_fee_bump` functions on wallet and the
 +final transaction is created by calling `finish` on the builder.
 +
 +- Removed `TxBuilder::utxos` in favor of repeatedly calling `add_utxo`
 +- Added `Wallet::build_tx` to replace `Wallet::create_tx`
 +- Added `Wallet::build_fee_bump` to replace `Wallet::bump_fee`
 +- Added `Wallet::get_utxo`
 +- Added `Wallet::get_descriptor_for_keychain`
  
  ### CLI
  #### Changed

diff --cc Cargo.toml
Simple merge