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

[teor at torproject.org]

commit dac74fbfab4ca159a7fd4611afd2f131052565fd
Merge: 15a2c20e3 792c15fde
Author: teor <teor at torproject.org>
Date:   Tue Dec 3 12:45:04 2019 +1000

    Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml         | 10 +++++++---
 changes/ticket32500 |  5 +++++
 2 files changed, 12 insertions(+), 3 deletions(-)