[tor-commits] [tor/master] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1

[nickm at torproject.org]

commit 483a59ec2a8285edcf4688755a9a17ddbdab75be
Merge: 9b19e33be 0e7f1b06e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 10:18:21 2018 -0500

    Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1

 .travis.yml | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)