This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 15e5b203cd248c066c01fdb23cd50c8554c26543 Merge: c733ccda99 5d2dc2d403 Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Nov 1 09:11:29 2022 -0400
Merge branch 'tor-gitlab/mr/594'
changes/bug40431 | 4 +++ doc/man/tor.1.txt | 1 - src/app/config/config.c | 24 -------------- src/app/config/or_options_st.h | 2 -- src/app/config/testnet.inc | 1 - src/feature/hs/hs_cache.c | 7 ++-- 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 - src/test/test_options.c | 38 ---------------------- 10 files changed, 8 insertions(+), 72 deletions(-)