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

diff --cc .travis.yml
index 39ed6132ccb2813c592fc9669d1fce9f8883815e,54b87975e9168303d5dbb288bef932cc0428fc43..b5713d69331c74eb881097e82c66e75750409d82
--- 1/.travis.yml
--- 2/.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

diff --cc configure.ac
Simple merge