diff --git a/Cargo.lock b/Cargo.lock
index 8dcb0e5..b3ab92f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -404,7 +404,7 @@ dependencies = [
  "serde_yaml",
  "structopt",
  "tempfile",
- "tokio",
+ "tokio 1.3.0",
  "tracing",
  "tracing-futures",
  "tracing-subscriber",
@@ -1241,7 +1241,7 @@ dependencies = [
  "http",
  "indexmap",
  "slab",
- "tokio",
+ "tokio 0.2.25",
  "tokio-util",
  "tracing",
  "tracing-futures",
@@ -1381,7 +1381,7 @@ dependencies = [
  "strum",
  "tempdir",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "tokio_safe_block_on",
  "toml",
  "tracing",
@@ -1417,7 +1417,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "tracing",
  "tracing-futures",
 ]
@@ -1457,7 +1457,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "tracing",
 ]
 
@@ -1491,7 +1491,7 @@ dependencies = [
  "shrinkwraprs",
  "tempdir",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "tokio_safe_block_on",
  "tracing",
  "tracing-futures",
@@ -1518,7 +1518,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "tokio_safe_block_on",
 ]
 
@@ -1594,7 +1594,7 @@ dependencies = [
  "serde_json",
  "shrinkwraprs",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "tokio_safe_block_on",
  "tracing",
  "tracing-futures",
@@ -1633,7 +1633,7 @@ dependencies = [
  "strum",
  "tempdir",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "tokio_safe_block_on",
  "tracing",
 ]
@@ -1702,7 +1702,7 @@ dependencies = [
  "net2",
  "serde",
  "serde_bytes",
- "tokio",
+ "tokio 0.2.25",
  "tokio-tungstenite",
  "tracing",
  "tracing-futures",
@@ -1793,7 +1793,7 @@ dependencies = [
  "itoa",
  "pin-project 1.0.5",
  "socket2",
- "tokio",
+ "tokio 0.2.25",
  "tower-service",
  "tracing",
  "want",
@@ -1808,7 +1808,7 @@ dependencies = [
  "bytes 0.5.6",
  "hyper",
  "native-tls",
- "tokio",
+ "tokio 0.2.25",
  "tokio-tls",
 ]
 
@@ -2009,7 +2009,7 @@ dependencies = [
  "serde_bytes",
  "shrinkwraprs",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "url2",
 ]
 
@@ -2032,7 +2032,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "structopt",
- "tokio",
+ "tokio 0.2.25",
  "tracing-subscriber",
  "webpki",
 ]
@@ -2052,7 +2052,7 @@ dependencies = [
  "rcgen",
  "rustls 0.17.0",
  "serde",
- "tokio",
+ "tokio 0.2.25",
  "webpki",
 ]
 
@@ -2071,7 +2071,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "url2",
 ]
 
@@ -2098,7 +2098,7 @@ dependencies = [
  "ring",
  "subtle 2.4.0",
  "thiserror",
- "tokio",
+ "tokio 0.2.25",
  "toml",
 ]
 
@@ -2111,7 +2111,7 @@ dependencies = [
  "ghost_actor",
  "lair_keystore_api",
  "tempfile",
- "tokio",
+ "tokio 0.2.25",
  "tracing",
 ]
 
@@ -2294,6 +2294,19 @@ dependencies = [
  "winapi 0.2.8",
 ]
 
+[[package]]
+name = "mio"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a"
+dependencies = [
+ "libc",
+ "log",
+ "miow 0.3.6",
+ "ntapi",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "mio-named-pipes"
 version = "0.1.7"
@@ -2301,7 +2314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
 dependencies = [
  "log",
- "mio",
+ "mio 0.6.23",
  "miow 0.3.6",
  "winapi 0.3.9",
 ]
@@ -2314,7 +2327,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
 dependencies = [
  "iovec",
  "libc",
- "mio",
+ "mio 0.6.23",
 ]
 
 [[package]]
@@ -2439,6 +2452,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "num-format"
 version = "0.4.0"
@@ -2871,11 +2893,11 @@ dependencies = [
  "err-derive",
  "futures",
  "libc",
- "mio",
+ "mio 0.6.23",
  "quinn-proto",
  "rustls 0.17.0",
  "socket2",
- "tokio",
+ "tokio 0.2.25",
  "tracing",
  "webpki",
 ]
@@ -3254,7 +3276,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio",
+ "tokio 0.2.25",
  "tokio-tls",
  "url 2.2.1",
  "wasm-bindgen",
@@ -3920,14 +3942,34 @@ dependencies = [
  "lazy_static",
  "libc",
  "memchr",
- "mio",
+ "mio 0.6.23",
  "mio-named-pipes",
  "mio-uds",
  "num_cpus",
  "pin-project-lite 0.1.12",
  "signal-hook-registry",
  "slab",
- "tokio-macros",
+ "tokio-macros 0.2.6",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "tokio"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d56477f6ed99e10225f38f9f75f872f29b8b8bd8c0b946f63345bb144e9eeda"
+dependencies = [
+ "autocfg 1.0.1",
+ "bytes 1.0.1",
+ "libc",
+ "memchr",
+ "mio 0.7.9",
+ "num_cpus",
+ "once_cell",
+ "parking_lot 0.11.1",
+ "pin-project-lite 0.2.6",
+ "signal-hook-registry",
+ "tokio-macros 1.1.0",
  "winapi 0.3.9",
 ]
 
@@ -3942,6 +3984,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "tokio-macros"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tokio-tls"
 version = "0.3.1"
@@ -3949,7 +4002,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
 dependencies = [
  "native-tls",
- "tokio",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -3962,7 +4015,7 @@ dependencies = [
  "log",
  "native-tls",
  "pin-project 0.4.27",
- "tokio",
+ "tokio 0.2.25",
  "tokio-tls",
  "tungstenite",
 ]
@@ -3978,7 +4031,7 @@ dependencies = [
  "futures-sink",
  "log",
  "pin-project-lite 0.1.12",
- "tokio",
+ "tokio 0.2.25",
 ]
 
 [[package]]
@@ -3988,7 +4041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c6fb7c6fbaf80432ed3ab96e1a5bf33ec1ed66a5206d4edf44910ba3ba3207d"
 dependencies = [
  "futures",
- "tokio",
+ "tokio 0.2.25",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 37be8a4..5a90e14 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ tempfile = "3.1"
 rmp-serde = "0.14.3"
 # holochain_websocket uses tokio 0.2
 # TODO: bump to 0.3 after https://github.com/holochain/holochain/pull/461 is merged
-tokio = { version = "0.2", features = ["full"] }
+tokio = { version = "1.3", features = ["full"] }
 tracing = { version = "0.1", features = ["attributes"] }
 tracing-futures = "0.2"
 tracing-subscriber = "0.2"