[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/merge-requests/48'

[ahf at torproject.org]

commit aba0ff4cb587e8771f360b516e2029aa6efcd547
Merge: c53c0e82b4 456be93956
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue Jul 14 16:07:36 2020 +0000

    Merge remote-tracking branch 'tor-gitlab/merge-requests/48'

 .gitignore                                    | 50 +++++++++++++--------------
 changes/ticket40044                           |  2 ++
 configure.ac                                  |  2 +-
 doc/include.am                                | 44 +++++++++++------------
 doc/{ => man}/tor-gencert.1.txt               |  0
 doc/{ => man}/tor-print-ed-signing-cert.1.txt |  0
 doc/{ => man}/tor-resolve.1.txt               |  0
 doc/{ => man}/tor.1.txt                       |  0
 doc/{ => man}/torify.1.txt                    |  0
 scripts/maint/checkOptionDocs.pl.in           |  2 +-
 src/app/config/config.c                       |  2 +-
 src/app/config/testnet.inc                    |  2 +-
 src/lib/log/log.c                             |  2 +-
 13 files changed, 54 insertions(+), 52 deletions(-)