commit 73b18f1f12d1a43f6f0febc0ee6c15776bf11a1a Merge: f99a64eea c660f4796 Author: teor teor@torproject.org Date: Thu Oct 17 14:51:44 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

.travis.yml | 58 ++++++++++++++++++++++------------------------------- changes/ticket30860 | 3 +++ changes/ticket31859 | 3 +++ 3 files changed, 30 insertions(+), 34 deletions(-)