Merge branch 'master' into disable-llvm-lines-on-regex

Author: rylev

Cargo.lock

@@ -9,7 +9,7 @@ env_logger = "0.8"
 anyhow = "1"
 thiserror = "1"
 futures = "0.3"
-tokio = { version = "1.6", features = ["macros", "time"] }
+tokio = { version = "1.26", features = ["macros", "time"] }
 log = "0.4"
 serde = { version = "1", features = ["rc"] }
 serde_derive = "1"