[tor-commits] [sbws/main] Merge branch 'm12'

[juga at torproject.org]

commit 10890538003f2b39b24d63cf53fde158c2edda6d
Merge: b9b5c48 51a9017
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Apr 27 12:12:20 2021 +0000

    Merge branch 'm12'

 .gitlab-ci.yml               | 10 ++++++++++
 .readthedocs.yml             |  2 +-
 README.rst                   | 10 +++++-----
 docs/source/index.rst        | 13 +++++++++++++
 docs/source/man_sbws.ini.rst |  2 +-
 docs/source/man_sbws.rst     |  2 +-
 6 files changed, 31 insertions(+), 8 deletions(-)