commit 63e549a6b4b57b2d70b83d14418bcad1f86136ce Merge: 9652c65fa 3bf9174fa Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 19 10:18:55 2018 -0500 Merge remote-tracking branch 'tlyu-github/travis-workaround-master' .travis.yml | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-)