commit 0acfd7dcee2a4473eba05a53d6df2d6d4fe2050b Merge: 5cbc0b388 40d7f1e3a Author: teor <teor@torproject.org> Date: Thu Aug 8 11:20:07 2019 +1000 Merge branch 'maint-0.4.1' .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-)