[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm@xxxxxxxxxxxxxx]

commit 57b207efa42e0a2794457cc7aff9c662d9000b44
Merge: 2b1b8bf2c ff1486385
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Sep 5 10:15:42 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

 .travis.yml      | 2 +-
 changes/bug27418 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index a64b5e61f,a323b4ecd..82eced41b
--- 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



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