Merge #1201 #1203

1201: build(deps): bump tokio-util from 0.7.2 to 0.7.3 r=delta1 a=dependabot[bot]

Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.7.2 to 0.7.3.
<details>
<summary>Commits</summary>
<ul>
<li><a href="14c77bc434"><code>14c77bc</code></a> chore: prepare tokio-util 0.7.3 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4744">#4744</a>)</li>
<li><a href="0241f1c54d"><code>0241f1c</code></a> chore: fix changelog typo (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4740">#4740</a>)</li>
<li><a href="674d77d4ef"><code>674d77d</code></a> chore: prepare Tokio v1.19.0 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4738">#4738</a>)</li>
<li><a href="42b4c27b88"><code>42b4c27</code></a> net: add <code>take_error</code> to <code>TcpSocket</code> and <code>TcpStream</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4739">#4739</a>)</li>
<li><a href="0d4d3c34f1"><code>0d4d3c3</code></a> sync: replace non-binding <code>if let</code> statements (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4735">#4735</a>)</li>
<li><a href="4941fbf7c4"><code>4941fbf</code></a> tokio: add 1.18.x as LTS release (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4733">#4733</a>)</li>
<li><a href="cc6c2f40cb"><code>cc6c2f4</code></a> tokio: check page capacity before obtaining base pointer (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4731">#4731</a>)</li>
<li><a href="925314ba43"><code>925314b</code></a> doc: clarify semantics of tasks outliving block_on (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4729">#4729</a>)</li>
<li><a href="f948cd7b33"><code>f948cd7</code></a> chore: fix clippy warnings (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4727">#4727</a>)</li>
<li><a href="83d0e7f8b3"><code>83d0e7f</code></a> runtime: add <code>is_finished</code> method for <code>JoinHandle</code> and <code>AbortHandle</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4709">#4709</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/tokio-rs/tokio/compare/tokio-util-0.7.2...tokio-util-0.7.3">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tokio-util&package-manager=cargo&previous-version=0.7.2&new-version=0.7.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

You can trigger a rebase of this PR by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

1203: build(deps): bump tokio from 1.16.1 to 1.19.2 r=delta1 a=dependabot[bot]

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.16.1 to 1.19.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/tokio-rs/tokio/releases">tokio's releases</a>.</em></p>
<blockquote>
<h2>Tokio v1.19.2</h2>
<h1>1.19.2 (June 6, 2022)</h1>
<p>This release fixes another bug in <code>Notified::enable</code>. (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4751">#4751</a>)</p>
<p><a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4751">#4751</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4751">tokio-rs/tokio#4751</a></p>
<h2>Tokio v1.19.1</h2>
<h1>1.19.1 (June 5, 2022)</h1>
<p>This release fixes a bug in <code>Notified::enable</code>. (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4747">#4747</a>)</p>
<p><a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4747">#4747</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4747">tokio-rs/tokio#4747</a></p>
<h2>Tokio v1.19.0</h2>
<h1>1.19.0 (June 3, 2022)</h1>
<h3>Added</h3>
<ul>
<li>runtime: add <code>is_finished</code> method for <code>JoinHandle</code> and <code>AbortHandle</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4709">#4709</a>)</li>
<li>runtime: make global queue and event polling intervals configurable (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4671">#4671</a>)</li>
<li>sync: add <code>Notified::enable</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4705">#4705</a>)</li>
<li>sync: add <code>watch::Sender::send_if_modified</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4591">#4591</a>)</li>
<li>sync: add resubscribe method to broadcast::Receiver (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4607">#4607</a>)</li>
<li>net: add <code>take_error</code> to <code>TcpSocket</code> and <code>TcpStream</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4739">#4739</a>)</li>
</ul>
<h3>Changed</h3>
<ul>
<li>io: refactor out usage of Weak in the io handle (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4656">#4656</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>macros: avoid starvation in <code>join!</code> and <code>try_join!</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4624">#4624</a>)</li>
</ul>
<h3>Documented</h3>
<ul>
<li>runtime: clarify semantics of tasks outliving <code>block_on</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4729">#4729</a>)</li>
<li>time: fix example for <code>MissedTickBehavior::Burst</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4713">#4713</a>)</li>
</ul>
<h3>Unstable</h3>
<ul>
<li>metrics: correctly update atomics in <code>IoDriverMetrics</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4725">#4725</a>)</li>
<li>metrics: fix compilation with unstable, process, and rt, but without net (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4682">#4682</a>)</li>
<li>task: add <code>#[track_caller]</code> to <code>JoinSet</code>/<code>JoinMap</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4697">#4697</a>)</li>
<li>task: add <code>Builder::{spawn_on, spawn_local_on, spawn_blocking_on}</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4683">#4683</a>)</li>
<li>task: add <code>consume_budget</code> for cooperative scheduling (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4498">#4498</a>)</li>
<li>task: add <code>join_set::Builder</code> for configuring <code>JoinSet</code> tasks (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4687">#4687</a>)</li>
<li>task: update return value of <code>JoinSet::join_one</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4726">#4726</a>)</li>
</ul>
<p><a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4498">#4498</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4498">tokio-rs/tokio#4498</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4591">#4591</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4591">tokio-rs/tokio#4591</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4607">#4607</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4607">tokio-rs/tokio#4607</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4624">#4624</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4624">tokio-rs/tokio#4624</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4656">#4656</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4656">tokio-rs/tokio#4656</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4671">#4671</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4671">tokio-rs/tokio#4671</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4682">#4682</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4682">tokio-rs/tokio#4682</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4683">#4683</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4683">tokio-rs/tokio#4683</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4687">#4687</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/4687">tokio-rs/tokio#4687</a></p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="340c4dc3b2"><code>340c4dc</code></a> chore: prepare Tokio v1.19.2 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4754">#4754</a>)</li>
<li><a href="7011a68343"><code>7011a68</code></a> time: add <code>StreamExt::chunks_timeout</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4695">#4695</a>)</li>
<li><a href="c7280167db"><code>c728016</code></a> sync: fix <code>will_wake</code> usage in <code>Notify</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4751">#4751</a>)</li>
<li><a href="bac7984417"><code>bac7984</code></a> chore: prepare Tokio v1.19.1 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4750">#4750</a>)</li>
<li><a href="a7e7eca893"><code>a7e7eca</code></a> sync: fix panic in <code>Notified::enable</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4747">#4747</a>)</li>
<li><a href="89ccf2ad2b"><code>89ccf2a</code></a> chore: prepare tokio-stream 0.1.9 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4743">#4743</a>)</li>
<li><a href="3f8a690c01"><code>3f8a690</code></a> chore: prepare tokio-macros 1.8.0 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4742">#4742</a>)</li>
<li><a href="14c77bc434"><code>14c77bc</code></a> chore: prepare tokio-util 0.7.3 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4744">#4744</a>)</li>
<li><a href="0241f1c54d"><code>0241f1c</code></a> chore: fix changelog typo (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4740">#4740</a>)</li>
<li><a href="674d77d4ef"><code>674d77d</code></a> chore: prepare Tokio v1.19.0 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/4738">#4738</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/tokio-rs/tokio/compare/tokio-1.16.1...tokio-1.19.2">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tokio&package-manager=cargo&previous-version=1.16.1&new-version=1.19.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

You can trigger a rebase of this PR by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Cargo.lock

@@ -761,7 +761,7 @@ dependencies = [
  "bitflags",
  "crossterm_winapi",
  "libc",
- "mio 0.8.4",
+ "mio",
  "parking_lot 0.12.0",
  "signal-hook",
  "signal-hook-mio",
@@ -2189,19 +2189,6 @@ dependencies = [
  "adler32",
 ]
 
-[[package]]
-name = "mio"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839"
-dependencies = [
- "libc",
- "log",
- "miow",
- "ntapi",
- "winapi",
-]
-
 [[package]]
 name = "mio"
 version = "0.8.4"
@@ -2214,16 +2201,6 @@ dependencies = [
  "windows-sys 0.36.1",
 ]
 
-[[package]]
-name = "miow"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
-dependencies = [
- "socket2 0.3.19",
- "winapi",
-]
-
 [[package]]
 name = "monero"
 version = "0.12.0"
@@ -2392,15 +2369,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "ntapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "num"
 version = "0.1.42"
@@ -3202,7 +3170,7 @@ dependencies = [
  "tokio",
  "tokio-rustls 0.23.1",
  "tokio-socks",
- "tokio-util 0.7.2",
+ "tokio-util 0.7.3",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -3643,7 +3611,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
 dependencies = [
  "libc",
- "mio 0.8.4",
+ "mio",
  "signal-hook",
 ]
 
@@ -4012,7 +3980,7 @@ dependencies = [
  "tokio-socks",
  "tokio-tar",
  "tokio-tungstenite",
- "tokio-util 0.7.2",
+ "tokio-util 0.7.3",
  "toml",
  "torut",
  "tracing",
@@ -4206,19 +4174,20 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.16.1"
+version = "1.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
+checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
 dependencies = [
  "bytes",
  "libc",
  "memchr",
- "mio 0.7.10",
+ "mio",
  "num_cpus",
  "once_cell",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.0",
  "pin-project-lite 0.2.9",
  "signal-hook-registry",
+ "socket2 0.4.7",
  "tokio-macros",
  "winapi",
 ]
@@ -4327,9 +4296,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c"
+checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
 dependencies = [
  "bytes",
  "futures-core",