Merge branch 'maint-0.3.3' into maint-0.3.4

diff --cc src/rust/Cargo.lock
index 1d2a7359aaa79db54a1ef690abbe69ec41b6b4c1,d2fd37e400d7de21b277e9343c49b76e7095af0b..3a067a39dcb572fea2acf877985deb0bf0e18878
--- 1/src/rust/Cargo.lock
--- 2/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"