commit 800b823c292009dd232d9758d1b40c61072e4433 Merge: 0081d6c11 d97d7f0e4 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 17 12:01:45 2019 -0400

Merge branch 'cmdline_refactor'

changes/ticket32003 | 4 + src/app/config/config.c | 228 +++++++++++++++----------- src/app/config/config.h | 24 ++- src/app/config/or_options_st.h | 8 +- src/app/config/quiet_level.h | 28 ++++ src/app/config/tor_cmdline_mode.h | 34 ++++ src/app/main/main.c | 53 +++--- src/app/main/ntmain.c | 1 + src/core/include.am | 2 + src/core/mainloop/mainloop.h | 1 - src/test/conf_examples/missing_cl_arg/cmdline | 1 + src/test/conf_examples/missing_cl_arg/error | 1 + src/test/conf_examples/missing_cl_arg/torrc | 0 13 files changed, 250 insertions(+), 135 deletions(-)