commit 4462766d32eb3ee4505e300b116dcb7493bf3b0b Merge: 2b3dc3384 9d562bba4 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 11 11:54:14 2019 -0500

Merge branch 'ticket32404'

changes/ticket32404 | 5 +++++ src/lib/conf/confdecl.h | 1 + src/lib/conf/conftypes.h | 21 +++++++++++++++++++-- src/lib/confmgt/confmgt.c | 5 +++++ src/lib/confmgt/type_defs.c | 15 +++++++-------- 5 files changed, 37 insertions(+), 10 deletions(-)