commit 7dc78aca2997c89c2bcf4f05cbb93ee326580488 Merge: 7a72e71f7 475dffee4 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 21 12:43:26 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1430' .travis.yml | 2 + changes/ticket32123 | 5 ++ configure.ac | 13 ++++- doc/HACKING/Module.md | 29 +++++----- src/app/config/config.c | 1 + src/core/include.am | 12 +++- src/core/mainloop/mainloop.c | 1 + src/core/or/circuituse.c | 1 + src/feature/client/proxymode.c | 27 +++++++++ src/feature/client/proxymode.h | 17 ++++++ src/feature/dirauth/authmode.h | 1 + src/feature/relay/router.c | 4 ++ src/feature/relay/router.h | 6 ++ src/feature/relay/routermode.c | 17 ------ src/feature/relay/routermode.h | 20 ++++++- src/test/conf_examples/bridgeauth_1/expected | 7 +++ .../conf_examples/bridgeauth_1/expected_no_dirauth | 7 +++ .../bridgeauth_1/expected_no_dirauth_relay | 6 ++ src/test/conf_examples/bridgeauth_1/torrc | 8 +++ src/test/conf_examples/dirauth_1/expected | 8 +++ .../conf_examples/dirauth_1/expected_no_dirauth | 7 +++ .../dirauth_1/expected_no_dirauth_relay | 6 ++ src/test/conf_examples/dirauth_1/torrc | 8 +++ .../conf_examples/ops_1/expected_no_dirauth_relay | 1 + .../conf_examples/ops_3/expected_no_dirauth_relay | 2 + .../conf_examples/ops_4/expected_no_dirauth_relay | 1 + .../conf_examples/ops_5/expected_no_dirauth_relay | 2 + src/test/test_key_expiration.sh | 5 ++ src/test/test_keygen.sh | 5 +- src/test/test_parseconf.sh | 64 ++++++++++++++++++---- src/test/test_zero_length_keys.sh | 5 ++ 31 files changed, 252 insertions(+), 46 deletions(-)