[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1486'

[teor at torproject.org]

commit b9269d6d0a19c998295a2b7910b54bf5f4b1e9c6
Merge: 616946954 b985cf240
Author: teor <teor at torproject.org>
Date:   Tue Nov 5 14:23:56 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1486'

 changes/ticket32344       |  4 +++
 src/app/config/config.c   | 86 +++++++++++++++++++----------------------------
 src/lib/conf/conftypes.h  |  5 +++
 src/lib/confmgt/confmgt.c | 45 +++++++++++++++++++++++--
 4 files changed, 86 insertions(+), 54 deletions(-)