Merge remote-tracking branch 'upstream/master' into patch-async

# Conflicts:
#	Cargo.toml

Author: stevefan1999-personal

Cargo.toml

@@ -11,6 +11,8 @@ categories = ["embedded", "no-std", "network-programming"]
 readme = "README.md"
 
 [dependencies]
+sha1 = { version = "0.10.1", default-features = false }
+heapless = "0.7.14"
 async-trait = { version = "0.1.56", optional = true }
 base64 = { version = "0.13.0", default-features = false }
 base64-simd = { version = "0.5.0", default-features = false, optional = true }
@@ -19,7 +21,7 @@ cfg-if = "1.0.0"
 heapless = "0.7.14"
 httparse = { version = "1.7.1", default-features = false }
 rand_core = "0.6.3"
-sha1 = "0.10.1"
+base64 = { version = "0.13.0", default-features = false }
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }