[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5

[teor at torproject.org]

commit 88723ad1694a96bdbb713ccb5bb47a9f5acdc8bd
Merge: 2b6df3da2 9d771ccc8
Author: teor <teor at torproject.org>
Date:   Wed Feb 12 12:18:59 2020 +1000

    Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5

 .travis.yml         | 2 --
 changes/ticket33075 | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)