commit 65e80ce6463b2ee0ed331535e5f50da52ce7d171 Merge: b3478a885 0bb2e7728 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 22 07:50:42 2019 -0400 Merge branch 'from_setconf_removal_squashed' changes/ticket31999 | 6 ++ src/app/config/config.c | 68 ++++++++------- src/app/config/config.h | 2 + src/app/config/quiet_level.c | 33 ++++++++ src/app/config/quiet_level.h | 2 + src/app/main/main.c | 23 +---- src/core/include.am | 1 + src/lib/log/log.c | 29 +++---- src/lib/log/log.h | 16 ++-- src/test/test_options.c | 196 ++++++++++++++++++++++++++++++++++++++++++- src/test/testing_common.c | 3 + 11 files changed, 300 insertions(+), 79 deletions(-)