commit 933b0c1b1badc1f02ebf5ff29916e3b6987cd8c5 Merge: b7d18f861 f86d508d4 Author: teor <teor@torproject.org> Date: Mon Dec 16 08:14:29 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1577' into maint-0.4.2 .travis.yml | 9 +++++---- changes/ticket32177 | 3 --- changes/ticket32629 | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-)