commit 34509e78c6280a103eb243865ce52a70f4a665d0 Merge: 71191fa3d 04addabb0 Author: teor <teor@torproject.org> Date: Wed Oct 23 22:59:16 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1449' changes/ticket32187 | 3 + src/app/config/config.c | 24 +- src/app/config/config.h | 5 +- src/app/config/statefile.c | 10 +- src/feature/dirauth/shared_random_state.c | 8 +- src/lib/confmgt/confparse.c | 2 +- src/lib/confmgt/confparse.h | 4 +- src/test/test_config.c | 8 +- src/test/test_confparse.c | 5 +- src/test/test_options.c | 542 +++++++++++++++--------------- 10 files changed, 286 insertions(+), 325 deletions(-)