diff --git a/client-demo/Cargo.toml b/client-demo/Cargo.toml
index 9f88aaac4..e7b145347 100644
--- a/client-demo/Cargo.toml
+++ b/client-demo/Cargo.toml
@@ -11,13 +11,12 @@ tor-netdir = { path="../tor-netdir", version= "*" }
 tor-netdoc = { path="../tor-netdoc", version= "*" }
 tor-proto = { path="../tor-proto", version= "*" }
 tor-linkspec = { path="../tor-linkspec", version= "*" }
-rand = "0.7.3"
-log = "0.4.11"
+
+async-native-tls = "0.3.3"
 async-std = "1.6.3"
 futures = "0.3.5"
-futures_codec = "0.4.1"
+log = "0.4.11"
 native-tls = "0.2.4"
-async-native-tls = "0.3.3"
-thiserror = "1.0.20"
-
+rand = "0.7.3"
 simple-logging = "2.0.2"
+thiserror = "1.0.20"
diff --git a/tor-bytes/Cargo.toml b/tor-bytes/Cargo.toml
index aec1b8312..9c23739c6 100644
--- a/tor-bytes/Cargo.toml
+++ b/tor-bytes/Cargo.toml
@@ -10,11 +10,11 @@ publish = false
 tor-llcrypto = { path="../tor-llcrypto" }
 
 arrayref = "0.3.6"
-generic-array = "0.14.4"
-crypto-mac = "0.9.1"
-thiserror = "1.0.20"
-signature = "1.2.2"
 bytes = "0.5.6"
+crypto-mac = "0.9.1"
+generic-array = "0.14.4"
+signature = "1.2.2"
+thiserror = "1.0.20"
 
 [dev-dependencies]
 hex-literal = "0.3.1"
diff --git a/tor-cert/Cargo.toml b/tor-cert/Cargo.toml
index 0df6afdfa..a8612d563 100644
--- a/tor-cert/Cargo.toml
+++ b/tor-cert/Cargo.toml
@@ -11,8 +11,9 @@ caret = { path="../caret" }
 tor-llcrypto = { path="../tor-llcrypto" }
 tor-bytes = { path="../tor-bytes" }
 tor-checkable = { path="../tor-checkable" }
-signature = "1.2.2"
+
 digest = "0.9.0"
+signature = "1.2.2"
 
 [dev-dependencies]
 base64 = "0.12.3"
diff --git a/tor-checkable/Cargo.toml b/tor-checkable/Cargo.toml
index 22eb42ae9..0f62e3184 100644
--- a/tor-checkable/Cargo.toml
+++ b/tor-checkable/Cargo.toml
@@ -7,7 +7,9 @@ license = "MIT OR Apache-2.0"
 publish = false
 
 [dependencies]
+tor-llcrypto = { path="../tor-llcrypto", version = "*" }
+
 signature = "1.2.2"
 thiserror = "1.0.20"
 
-tor-llcrypto = { path="../tor-llcrypto", version = "*" }
+
diff --git a/tor-llcrypto/Cargo.toml b/tor-llcrypto/Cargo.toml
index 4199375c8..9d883d7d6 100644
--- a/tor-llcrypto/Cargo.toml
+++ b/tor-llcrypto/Cargo.toml
@@ -7,30 +7,28 @@ license = "MIT OR Apache-2.0"
 publish = false
 
 [dependencies]
-arrayref = "0.3.6"
-digest = "0.9.0"
-typenum = "1.12.0"
-generic-array = "0.14.4"
 aes-ctr = "0.4.0"
-zeroize = "1.1.0"
-rsa = "0.3.0"
-simple_asn1= "0.4.1"
-subtle = "2.3.0"
-# This is paused for now because of aes-ctr.
-stream-cipher = "0.4.0"
-num-traits = "0.2.12"
-num-bigint = "0.3.0"
+arrayref = "0.3.6"
 curve25519-dalek = "3.0.0"
-x25519-dalek = "1.1.0"
+digest = "0.9.0"
 ed25519-dalek = "1.0.0"
+hex = "0.4.2"
+num-bigint = "0.3.0"
+num-traits = "0.2.12"
+rsa = "0.3.0"
 sha-1 = "0.9.1"
 sha2 = "0.9.1"
 sha3 = "0.9.1"
 signature = "1.2.2"
-hex = "0.4.2"
+simple_asn1 = "0.4.1"
+subtle = "2.3.0"
+x25519-dalek = "1.1.0"
+zeroize = "1.1.0"
 
 [dev-dependencies]
 hex-literal = "0.3.1"
+# This is paused for now because of aes-ctr.
+stream-cipher = "0.4.0"
 
 # This is a magic crate that runs the tests and checks the format
 # before it lets you commit or push.  It installs git hooks for this whenever
diff --git a/tor-netdir/Cargo.toml b/tor-netdir/Cargo.toml
index abc983401..6b1f1dfab 100644
--- a/tor-netdir/Cargo.toml
+++ b/tor-netdir/Cargo.toml
@@ -10,13 +10,14 @@ publish = false
 tor-checkable = { path="../tor-checkable", version= "*" }
 tor-netdoc = { path="../tor-netdoc", version= "*" }
 tor-linkspec = { path="../tor-linkspec", version= "*" }
-thiserror = "1.0.20"
-signature = "1.2.2"
 tor-llcrypto = { path="../tor-llcrypto", version= "*" }
 tor-protover = { path="../tor-protover", version= "*" }
+
 hex = "0.4.2"
 log = "0.4.11"
 rand = "0.7.3"
+signature = "1.2.2"
+thiserror = "1.0.20"
 
 [dev-dependencies]
 simple-logging = "2.0.2"
diff --git a/tor-netdoc/Cargo.toml b/tor-netdoc/Cargo.toml
index e05d42c01..944b0116d 100644
--- a/tor-netdoc/Cargo.toml
+++ b/tor-netdoc/Cargo.toml
@@ -13,11 +13,11 @@ tor-cert = { path="../tor-cert", version="*" }
 tor-protover = { path="../tor-protover", version= "*" }
 tor-checkable = { path="../tor-checkable", version= "*" }
 
+base64 = "0.12.3"
+chrono = "0.4.15"
 digest = "0.9.0"
-phf = { version = "0.8.0", features = ["macros"] }
 hex = "0.4.2"
 lazy_static = "1.4.0"
-base64 = "0.12.3"
-thiserror = "1.0.20"
-chrono = "0.4.15"
+phf = { version = "0.8.0", features = ["macros"] }
 signature = "1.2.2"
+thiserror = "1.0.20"
diff --git a/tor-proto/Cargo.toml b/tor-proto/Cargo.toml
index 0ea555acd..a97162597 100644
--- a/tor-proto/Cargo.toml
+++ b/tor-proto/Cargo.toml
@@ -15,23 +15,22 @@ tor-linkspec = { path="../tor-linkspec" }
 tor-checkable = { path="../tor-checkable" }
 
 arrayref = "0.3.6"
-digest = "0.9.0"
-rand = "0.7.3"
-typenum = "1.12.0"
-generic-array = "0.14.4"
-rand_core = "0.5.1"
+bytes = "0.5.6"
 crypto-mac = "0.9.1"
-hmac = "0.9.0"
+digest = "0.9.0"
+futures = "0.3.5"
+futures_codec = "0.4.1"
+generic-array = "0.14.4"
 hkdf = "0.9.0"
-zeroize = "1.1.0"
-subtle = "2.3.0"
+hmac = "0.9.0"
+rand = "0.7.3"
+rand_core = "0.5.1"
 # This is paused for now because of aes-ctr.
 stream-cipher = "0.4.0"
-sha2 = "0.9.1"
-futures_codec = "0.4.1"
-bytes = "0.5.6"
+subtle = "2.3.0"
 thiserror = "1.0.20"
-futures = "0.3.5"
+typenum = "1.12.0"
+zeroize = "1.1.0"
 
 [dev-dependencies]
 hex-literal = "0.3.1"
diff --git a/tor-proto/src/crypto/handshake/ntor.rs b/tor-proto/src/crypto/handshake/ntor.rs
index 6018dbe4b..6c66c813a 100644
--- a/tor-proto/src/crypto/handshake/ntor.rs
+++ b/tor-proto/src/crypto/handshake/ntor.rs
@@ -12,6 +12,7 @@ use super::KeyGenerator;
 use crate::util::ct;
 use crate::{Error, Result, SecretBytes};
 use tor_bytes::{Reader, Writer};
+use tor_llcrypto::d;
 use tor_llcrypto::pk::curve25519::*;
 use tor_llcrypto::pk::rsa::RSAIdentity;
 
@@ -70,7 +71,7 @@ impl KeyGenerator for NtorHKDFKeyGenerator {
     }
 }
 
-type Authcode = crypto_mac::Output<hmac::Hmac<sha2::Sha256>>;
+type Authcode = crypto_mac::Output<hmac::Hmac<d::Sha256>>;
 
 /// Perform a client handshake, generating an onionskin and a state object
 pub fn client_handshake_ntor_v1<R>(