commit f5f4a68610c7e17d3f8a600d7be412b7c463528a Merge: 3bda8ab0a 85719b79b Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)