[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit c30d2daae0c520e24cad6ef4105ec52bca5ead3a
Merge: 256cd9d87 483a59ec2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 10:18:59 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

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