From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Sep 2018 14:15:42 +0000 (-0400)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.2
X-Git-Tag: tor-0.3.2.12~8^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57b207efa42e0a2794457cc7aff9c662d9000b44;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.2
---

57b207efa42e0a2794457cc7aff9c662d9000b44
diff --cc .travis.yml
index a64b5e61f2,a323b4ecd4..82eced41b2
--- a/.travis.yml
+++ b/.travis.yml
@@@ -169,8 -133,8 +169,8 @@@ install
  
  script:
    - ./autogen.sh
 -  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules"
 +  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
-   - echo $CONFIGURE_FLAGS
+   - echo "Configure flags are $CONFIGURE_FLAGS"
    - ./configure $CONFIGURE_FLAGS
    ## We run `make check` because that's what https://jenkins.torproject.org does.
    - if [[ "$DISTCHECK" == "" ]]; then make check; fi