From: Roger Dingledine <arma@torproject.org>
Date: Tue, 5 Feb 2019 13:09:47 +0000 (-0500)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.11~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ea98c0f4cac6d2d8a90104425d04db57e39ec1f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4
---

8ea98c0f4cac6d2d8a90104425d04db57e39ec1f
diff --cc src/rust/Cargo.lock
index 1d2a7359aa,d2fd37e400..3a067a39dc
--- a/src/rust/Cargo.lock
+++ b/src/rust/Cargo.lock
@@@ -1,25 -1,5 +1,27 @@@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
 +[[package]]
 +name = "crypto"
 +version = "0.0.1"
 +dependencies = [
 + "digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "external 0.0.1",
 + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand 0.5.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.2.0-pre.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "smartlist 0.0.1",
 + "tor_allocate 0.0.1",
 + "tor_log 0.1.0",
 +]
 +
 +[[package]]
 +name = "digest"
 +version = "0.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "external"
  version = "0.0.1"