commit b9b5c48e7a52dd42bdc3c3c066258fab605f026e Merge: 7da8d72 0f5fa3a Author: juga0 juga@riseup.net Date: Fri Apr 16 11:41:52 2021 +0000
Merge branch 'maint-1.1'
.gitchangelog.rc | 3 +- .gitchangelogrst.tpl | 12 +- .gitlab-ci.yml | 19 +- AUTHORS.md => AUTHORS.rst | 16 +- CHANGELOG.rst | 607 +++++++++++++++++++++++++++++++++++++++++++ LICENSE.md | 39 --- LICENSE.rst | 125 +++++++++ README.md | 71 ----- README.rst | 74 ++++++ docs/source/AUTHORS.md | 1 - docs/source/AUTHORS.rst | 1 + docs/source/README.md | 1 - docs/source/README.rst | 1 + docs/source/conf.py | 4 - docs/source/documenting.rst | 5 +- docs/source/torflow_aggr.rst | 4 +- scripts/maint/release.py | 7 +- setup.cfg | 1 - 18 files changed, 849 insertions(+), 142 deletions(-)
tor-commits@lists.torproject.org