[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

[arma at torproject.org]

commit 8ea98c0f4cac6d2d8a90104425d04db57e39ec1f
Merge: 1c5f03fba 4d7a0a131
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Feb 5 08:09:47 2019 -0500

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug29244    | 4 ++++
 src/rust/Cargo.lock | 2 ++
 2 files changed, 6 insertions(+)

diff --cc src/rust/Cargo.lock
index 1d2a7359a,d2fd37e40..3a067a39d
--- a/src/rust/Cargo.lock
+++ b/src/rust/Cargo.lock
@@@ -1,26 -1,6 +1,28 @@@
+ # 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"
  dependencies = [