commit 996e82515514625b4ee1ed76c00d62c6d49d9770 Merge: 05bb23c 8716c1d Author: juga0 juga@riseup.net Date: Sun Feb 9 19:19:23 2020 +0000

Merge branch 'maint-1.1_issue30067_travis' into maint-1.1

.travis.yml | 148 +++++++-- tests/deb.torproject.org.asc | 708 ------------------------------------------- tox.ini | 9 +- 3 files changed, 135 insertions(+), 730 deletions(-)