commit c72f0cd5c77ffceb6f0275295c3446a908b17a75 Merge: 15591e1bb 8ff6ab0a3 Author: teor <teor@torproject.org> Date: Wed Apr 17 16:46:40 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 2 +- changes/ticket30117 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)