commit 0b0dfe8e489a2e67ab9c3ddb44eca818d9125804 Merge: fe8ecfe 996e825 Author: juga0 juga@riseup.net Date: Sun Feb 9 19:20:10 2020 +0000

Merge branch 'maint-1.1'

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