commit 72db4f836ac86759e69bac3e2b310cc1ca5ba81a Merge: 35179a8c0 1aa0ae2cc Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .travis.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)