commit 98157c72cd9ddcfd92cd5cd2749d19d1677efd14 Merge: ad8347418 2dee38fba Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.3' .travis.yml | 4 ++-- changes/ticket25714 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)