commit a0efba9bd0af20e6588784a509f4d50dd5951876 Merge: a34a88c6f 384111cd4 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 23 09:05:45 2020 -0400

Merge remote-tracking branch 'tor-github/pr/1797/head'

changes/ticket32994 | 3 + src/app/config/config.c | 181 +++++++++++++++++++++++------------------------- 2 files changed, 89 insertions(+), 95 deletions(-)