commit 6684c6e17fd6e038159dd2ca63416cdcd7a12270 Merge: 8096f3b25 7d673e70b Author: David Goulet dgoulet@torproject.org Date: Mon Mar 9 09:33:05 2020 -0400

Merge branch 'tor-github/pr/1751'

changes/ticket32905 | 6 +++ doc/tor.1.txt | 7 --- src/app/config/config.c | 2 +- src/app/config/or_options_st.h | 3 -- src/core/or/policies.c | 17 +------- src/core/or/policies.h | 1 - src/feature/client/bridges.c | 3 +- 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_policy.c | 50 ---------------------- 11 files changed, 10 insertions(+), 82 deletions(-)