commit 43211c3a0c4b56d4100daf3a541250b953fb7230 Merge: 58299b292 8812f562a Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 1 12:12:33 2018 -0500

Merge remote-tracking branch 'public/bug27893'

changes/bug27893 | 3 +++ src/app/config/config.c | 9 +++++++++ src/app/config/confparse.c | 5 +++-- src/app/config/confparse.h | 4 ++++ src/app/config/statefile.c | 9 +++++++++ src/feature/dirauth/shared_random_state.c | 8 ++++++++ 6 files changed, 36 insertions(+), 2 deletions(-)