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

[nickm at torproject.org]

commit e2aacf100f5112aa8d0564b9f90ce38048ee0a82
Merge: 44388757c 483a59ec2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 10:18:29 2018 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

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