Merge branch 'post-release-fix-20220527' into 'main'

Fix minor issues found while publishing crates for Arti 0.4.0

See merge request tpo/core/arti!547

crates/tor-error/Cargo.toml

@@ -9,7 +9,7 @@ homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home"
 description = "Provides the unified type-erased error type returned by many (esp. high-level) Tor APIs."
 keywords = ["tor", "arti"]
 repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
-categories = ["tor"]
+categories = ["rust-patterns"]
 
 [features]
 default = ["backtrace"]

crates/tor-rtcompat/src/lib.rs

@@ -179,6 +179,7 @@ pub mod scheduler;
 mod timer;
 mod traits;
 
+#[cfg(any(feature = "async-std", feature = "tokio"))]
 use std::io;
 pub use traits::{
     BlockOn, CertifiedConn, Runtime, SleepProvider, TcpListener, TcpProvider, TlsProvider,