]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'rust_build_script_v3' into additional_rust_test_fixes
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Jun 2018 21:07:47 +0000 (17:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Jun 2018 21:07:47 +0000 (17:07 -0400)
1  2 
configure.ac
src/rust/crypto/Cargo.toml

diff --cc configure.ac
Simple merge
index 08b0832c94866c83e925a32f307f8ddbdb11bd4a,9d302ee3ba85e00b1b4b22cc47d03609416de822..869e0d62566e04933014cb299c17bf6608b7a005
@@@ -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"]