tor

commit 8b32d22a072a334917fba8569042ff61d7026d27
parent 90f4ed2335fee8bba6e232c6d92078cb133f5b9e
Author: teor <teor@torproject.org>
Date:   Thu, 22 Aug 2019 22:10:00 +1000

Merge branch 'bug31463_035' into bug31463_040

Diffstat:
M
.travis.yml
 | 
2
+-
A
changes/bug31463
 | 
3
+++

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
@@ -91,7 +91,7 @@ matrix:
     - compiler: gcc
       os: linux
       ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2
-      env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
+      env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
 
 ## (Linux only) Use the latest Linux image (Ubuntu Trusty)
 dist: trusty
diff --git a/changes/bug31463 b/changes/bug31463
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+    - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463;
+      bugfix on 0.3.5.4-alpha.