commit e6579d801f2a7536123dccde2edcff4cc33683a3 Merge: 125a6300d 7c6cc470f Author: David Goulet dgoulet@torproject.org Date: Wed Jun 19 07:47:03 2019 -0400
Merge branch 'tor-github/pr/1113'
changes/bug30894 | 4 + changes/ticket30893 | 3 + src/app/config/config.c | 31 +- src/app/config/confparse.c | 44 +- src/app/config/confparse.h | 13 +- src/app/config/statefile.c | 14 +- src/feature/dirauth/shared_random_state.c | 2 +- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_confparse.c | 842 ++++++++++++++++++++++++++++++ 11 files changed, 905 insertions(+), 51 deletions(-)