[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit 267671bdaaa079e0c1757ad689f7c54f24ac71ab
Merge: 92c60b572 85719b79b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 05:42:43 2018 -0400

    Merge branch 'maint-0.3.3'

 .travis.yml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)