[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[teor at torproject.org]

commit 38cc3a45b655a07f8834ddcd1514f04b09bd80a0
Merge: 95caab8cc 37b04aeed
Author: teor <teor at torproject.org>
Date:   Fri Dec 20 10:12:30 2019 +1000

    Merge branch 'maint-0.2.9' into release-0.2.9

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