commit 9049b545c21bfda637faf28accbd74e3fc025cb6 Merge: 37698d92b 35257a1c6 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 26 07:27:50 2019 -0500 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug13221 | 5 +++++ src/app/config/config.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-)