[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9

[teor at torproject.org]

commit 7dd59460941c50242e740ff0cbd84b588d66e26e
Merge: b7b467d3a b84e7715d
Author: teor <teor at torproject.org>
Date:   Mon Dec 16 08:13:38 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9

 .travis.yml         | 5 ++---
 changes/ticket32177 | 3 ---
 changes/ticket32629 | 4 ++++
 3 files changed, 6 insertions(+), 6 deletions(-)