commit 383cf4fa9150ded0a21e64788f2e521c9ddc0173 Merge: 15fbb2b c5fe10e Author: Georg Koppen gk@torproject.org Date: Fri Jul 10 23:00:52 2020 +0000

Merge branch 'maint-1.1'

DEPLOY.rst | 16 ++++++++++++---- INSTALL.rst | 57 +++++++++++++++++++++++++++++++++++++++++++-------------- setup.py | 5 ++++- 3 files changed, 59 insertions(+), 19 deletions(-)