commit 95caab8cc6962066a20390282afdd70ba6e6ec2b Merge: e49ec773d 7dd594609 Author: teor <teor@torproject.org> Date: Mon Dec 16 08:15:46 2019 +1000 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 5 ++--- changes/ticket32177 | 3 --- changes/ticket32629 | 4 ++++ 3 files changed, 6 insertions(+), 6 deletions(-)