commit a9628c0c0b2cc5c0286c4e49591b3b18dc054e87 Merge: 2e5eb0292 cd2be4283 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 2 13:38:47 2018 -0400 Merge branch 'maint-0.3.4' .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)