commit 698334eee7252c533882972aa8c734e3b674edaf Merge: c9b4ddc88 e2aacf100 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)