commit 80d2376f33506adafd4e82cb7cd824f66d8e213a Merge: ebaa1a1d23 deea196370 Author: David Goulet <dgoulet@torproject.org> Date: Tue Aug 18 08:49:07 2020 -0400 Merge branch 'maint-0.4.4' changes/ticket24308 | 6 ++++++ src/app/config/config.c | 29 +++++++++++++++++++++++------ src/app/config/config.h | 2 +- 3 files changed, 30 insertions(+), 7 deletions(-)