commit 2c2c349bdfbb2ac6eb9624607a2153deebdb7426 Merge: 789de7c35 e63bfca5f Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)