[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1515'
nickm at torproject.org
nickm at torproject.org
Thu Nov 7 12:23:17 UTC 2019
commit 45698e89edecce71256bc5e2529f9610b0eea50f
Merge: 7ee1e16c6 a0820bc00
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Nov 7 07:23:09 2019 -0500
Merge remote-tracking branch 'tor-github/pr/1515'
changes/ticket32410 | 3 +++
src/app/config/config.c | 12 ++++++++++++
src/app/config/or_options_st.h | 4 +++-
src/feature/relay/relay_config.h | 3 ---
src/test/conf_examples/badnick_1/error_no_dirauth_relay | 1 -
src/test/conf_examples/badnick_1/expected_no_dirauth_relay | 1 +
src/test/conf_examples/badnick_1/torrc | 2 ++
src/test/conf_examples/badnick_2/error_no_dirauth_relay | 1 -
src/test/conf_examples/badnick_2/expected_no_dirauth_relay | 1 +
src/test/conf_examples/badnick_2/torrc | 2 ++
.../conf_examples/contactinfo_notutf8/error_no_dirauth_relay | 1 -
.../contactinfo_notutf8/expected_no_dirauth_relay | 1 +
src/test/conf_examples/contactinfo_notutf8/torrc | 4 ++++
src/test/conf_examples/example_1/error_no_dirauth_relay | 1 -
src/test/conf_examples/example_3/error_no_dirauth_relay | 1 -
src/test/conf_examples/pt_01/error_no_dirauth_relay | 1 -
src/test/conf_examples/pt_02/error_no_dirauth_relay | 1 -
src/test/conf_examples/pt_02/expected_no_dirauth_relay | 8 ++++++++
src/test/conf_examples/pt_02/torrc | 2 ++
src/test/conf_examples/pt_03/error_no_dirauth_relay | 1 -
src/test/conf_examples/pt_04/error_no_dirauth_relay | 1 -
src/test/conf_examples/pt_06/error_no_dirauth_relay | 1 -
src/test/conf_examples/pt_08/error_no_dirauth_relay | 1 -
src/test/conf_examples/pt_08/expected_no_dirauth_relay | 2 ++
src/test/conf_examples/pt_08/torrc | 2 ++
src/test/conf_examples/relay_01/error_no_dirauth_relay | 1 -
26 files changed, 43 insertions(+), 16 deletions(-)
More information about the tor-commits
mailing list