[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/381' into maint-0.3.5

[nickm@xxxxxxxxxxxxxx]

commit 262b0fe7a00f9f13980c408b975f08fcdc8ec117
Merge: 709cd447f 828578496
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Oct 30 08:39:57 2018 -0400

    Merge remote-tracking branch 'tor-github/pr/381' into maint-0.3.5

 .travis.yml                      | 15 +++++----------
 configure.ac                     |  9 ++++-----
 link_rust.sh.in                  | 10 ----------
 src/rust/Cargo.lock              |  1 +
 src/rust/Cargo.toml              | 16 ----------------
 src/rust/crypto/Cargo.toml       |  1 -
 src/rust/external/Cargo.toml     |  6 ++----
 src/rust/external/lib.rs         |  2 +-
 src/rust/protover/Cargo.toml     |  1 -
 src/rust/smartlist/Cargo.toml    |  1 -
 src/rust/smartlist/lib.rs        |  9 +++++++++
 src/rust/tor_allocate/Cargo.toml |  1 -
 src/rust/tor_allocate/lib.rs     |  5 +++++
 src/rust/tor_log/Cargo.toml      |  1 -
 src/rust/tor_rust/Cargo.toml     |  2 +-
 src/rust/tor_util/Cargo.toml     |  1 -
 src/test/include.am              |  3 +--
 src/test/test_rust.sh            | 10 +++++++++-
 18 files changed, 38 insertions(+), 56 deletions(-)

diff --cc .travis.yml
index 39ed6132c,54b87975e..b5713d693
--- a/.travis.yml
+++ b/.travis.yml
@@@ -51,16 -47,11 +47,15 @@@ matrix
      # - env: HARDENING_OPTIONS=""
      ## We check asciidoc with distcheck, to make sure we remove doc products
      - env: DISTCHECK="yes" ASCIIDOC_OPTIONS=""
 +    # We clone our stem repo and run `make test-stem`
 +    - env: TEST_STEM="yes"
      ## Check rust online with distcheck, to make sure we remove rust products
-     ## But without hardening (see above)
-     - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS=""
+     - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
      ## Check disable module dirauth with and without rust
-     - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
+     - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
      - env: MODULES_OPTIONS="--disable-module-dirauth"
 +    ## Check NSS
 +    - env: NSS_OPTIONS="--enable-nss"
  
    ## Uncomment to allow the build to report success (with non-required
    ## sub-builds continuing to run) if all required sub-builds have



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits