tor

commit a1c110a2a478d3fae50871741d52659cc34f4623
parent 2a33edc595a619d6c2abcb260195f92d97192d6a
Author: teor <teor@torproject.org>
Date:   Fri, 10 Aug 2018 16:41:27 +1000

Merge branch 'travis-osx-033' into travis-osx-034

Take the asciidoc changes from 033, and the module changes from
034.

Diffstat:
M
.travis.yml
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -148,6 +148,7 @@ install:
   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi
   ## If we're on OSX, and using asciidoc, install asciidoc
   - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi
+  - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi
   ## If we're using Rust, download rustup
   - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi
   ## Install the stable channels of rustc and cargo and setup our toolchain environment