[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit 03e787e220a92996ecca1c9bc262f29ee37ececc
Merge: 2c36a02bb 95b78d417
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 21 17:05:42 2018 -0400

    Merge branch 'maint-0.3.3'

 doc/HACKING/CodingStandardsRust.md      | 36 ++++++++++++++++++++++++++
 scripts/maint/updateRustDependencies.sh | 45 +++++++++++++++++++++++++++++++++
 src/ext/rust                            |  2 +-
 src/rust/Cargo.lock                     | 29 ++++++++++-----------
 src/rust/external/Cargo.toml            |  2 +-
 src/rust/protover/Cargo.toml            |  2 +-
 src/rust/smartlist/Cargo.toml           |  2 +-
 src/rust/tor_allocate/Cargo.toml        |  2 +-
 src/rust/tor_util/Cargo.toml            |  2 +-
 9 files changed, 101 insertions(+), 21 deletions(-)

diff --cc src/rust/Cargo.lock
index 116ef17f1,4f918c022..717add222
--- a/src/rust/Cargo.lock
+++ b/src/rust/Cargo.lock
@@@ -24,10 -15,9 +15,10 @@@ name = "protover
  version = "0.0.1"
  dependencies = [
   "external 0.0.1",
-  "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
   "smartlist 0.0.1",
   "tor_allocate 0.0.1",
 + "tor_log 0.1.0",
   "tor_util 0.0.1",
  ]
  
diff --cc src/rust/protover/Cargo.toml
index 3f70155ef,86301b878..af1089c91
--- a/src/rust/protover/Cargo.toml
+++ b/src/rust/protover/Cargo.toml
@@@ -3,11 -3,8 +3,11 @@@ authors = ["The Tor Project"
  version = "0.0.1"
  name = "protover"
  
 +[features]
 +testing = ["tor_log/testing"]
 +
  [dependencies]
- libc = "0.2.22"
+ libc = "=0.2.39"
  
  [dependencies.smartlist]
  path = "../smartlist"
diff --cc src/rust/tor_util/Cargo.toml
index adc3390b5,b540d8c84..a606a280b
--- a/src/rust/tor_util/Cargo.toml
+++ b/src/rust/tor_util/Cargo.toml
@@@ -11,9 -11,6 +11,9 @@@ crate_type = ["rlib", "staticlib"
  [dependencies.tor_allocate]
  path = "../tor_allocate"
  
 +[dependencies.tor_log]
 +path = "../tor_log"
 +
  [dependencies]
- libc = "0.2.22"
+ libc = "=0.2.39"