commit 748117298341de8a279f4437b6d557f0d50edb63 Merge: b9504f788 1cd20ff84 Author: teor <teor@torproject.org> Date: Mon Dec 16 08:16:04 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 9 +++++---- changes/ticket32177 | 3 --- changes/ticket32629 | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-)