tor

commit 6463cdea55bbeb711a10153156a4b93f2471d034
parent ed1210d0f11d21ce97823f88bf20d3659a8927cf
Author: teor <teor@torproject.org>
Date:   Fri, 10 Aug 2018 19:06:32 +1000

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

Diffstat:
M
.travis.yml
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -146,6 +146,7 @@ install:
   ## 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 [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; 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