tor

The Tor anonymity network
git clone https://git.dasho.dev/tor.git
Log | Files | Refs | README | LICENSE

commit 57b207efa42e0a2794457cc7aff9c662d9000b44
parent 2b1b8bf2cad4af304d38f88e38047dadddd7e0be
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  5 Sep 2018 10:15:42 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

Diffstat:
M.travis.yml | 2+-
Achanges/bug27418 | 3+++
2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml @@ -170,7 +170,7 @@ install: script: - ./autogen.sh - 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 diff --git a/changes/bug27418 b/changes/bug27418 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - When we use echo in Travis, don't pass a --flag as the first argument. + Fixes bug 27418; bugfix on 0.3.4.7-rc.