[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/161'

[ahf at torproject.org]

commit 78aa037c4191edf4231502d5584f9e1ed4834bca
Merge: 5d23881770 458897e3c5
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue Oct 13 13:50:14 2020 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/161'

 changes/ticket32181                                |  4 ++
 configure.ac                                       |  4 --
 doc/man/tor.1.txt                                  |  7 +-
 src/app/config/config.c                            | 16 +++--
 src/app/config/or_options_st.h                     |  1 -
 src/lib/log/log.c                                  | 81 ++--------------------
 src/lib/log/log.h                                  |  4 --
 src/test/conf_examples/large_1/expected            |  1 -
 src/test/conf_examples/large_1/expected_no_dirauth |  1 -
 src/test/conf_examples/large_1/torrc               |  1 -
 10 files changed, 19 insertions(+), 101 deletions(-)