[tor-commits] [tor/master] Merge branch 'rust_build_script_v3' into additional_rust_test_fixes

[nickm at torproject.org]

commit e99ecf939936ed1e8fabbf2f30488d20389ecb7b
Merge: 7589fd6d4 bd9ebb376
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 20 17:07:47 2018 -0400

    Merge branch 'rust_build_script_v3' into additional_rust_test_fixes

 .gitignore                 |   2 +
 config.rust.in             |  22 ++++++
 configure.ac               |  20 +++++
 link_rust.sh.in            |  10 +++
 src/rust/build.rs          | 179 +++++++++++++++++++++++++++++++++++++++++++++
 src/rust/crypto/Cargo.toml |   2 +-
 src/test/include.am        |   7 +-
 7 files changed, 239 insertions(+), 3 deletions(-)

diff --cc src/rust/crypto/Cargo.toml
index 08b0832c9,9d302ee3b..869e0d625
--- a/src/rust/crypto/Cargo.toml
+++ b/src/rust/crypto/Cargo.toml
@@@ -25,4 -26,4 +26,3 @@@ rand = { version = "=0.5.0-pre.2", defa
  rand_core = { version = "=0.2.0-pre.0", default-features = false }
  
  [features]
- 
 -testing = ["tor_log/testing"]