[tor-commits] [sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/13' into maint-1.1

[juga at torproject.org]

commit c5fe10e4f4725bc844fca04e233b105933d2c70b
Merge: 3e86fd5 e8a5d80
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jul 10 22:59:07 2020 +0000

    Merge remote-tracking branch 'gitlab/merge-requests/13' into maint-1.1

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