aboutsummaryrefslogtreecommitdiff
path: root/src/rust
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2019-02-05 08:10:14 -0500
committerRoger Dingledine <arma@torproject.org>2019-02-05 08:10:14 -0500
commitbca25eebfbc9e80665d63bbe02ba5ce21081eab1 (patch)
tree2a9e7ff9c3628777a3d38296e26ae59b7d995a4b /src/rust
parent712a622fcecd43a7a50c7b35a9811f1210aeadb8 (diff)
parent8ea98c0f4cac6d2d8a90104425d04db57e39ec1f (diff)
downloadtor-bca25eebfbc9e80665d63bbe02ba5ce21081eab1.tar.gz
tor-bca25eebfbc9e80665d63bbe02ba5ce21081eab1.zip
Merge branch 'maint-0.3.4' into maint-0.3.5
Diffstat (limited to 'src/rust')
-rw-r--r--src/rust/Cargo.lock2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
index 7d6a6635c5..e2f24b0af7 100644
--- a/src/rust/Cargo.lock
+++ b/src/rust/Cargo.lock
@@ -1,3 +1,5 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
[[package]]
name = "crypto"
version = "0.0.1"