Commit 357e9a6f authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge branch 'maint-0.3.5' into maint-0.4.0

parents 90f4ed23 190386f1

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -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

changes/bug31463

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (rust):

    - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463;

      bugfix on 0.3.5.4-alpha.