commit fe68d83b246d8a5d0e6be90efaec2de6e922be62 Merge: 21b330365 cf7580ab0 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 20 13:31:32 2019 -0500 Merge branch 'bug32555' src/app/config/config.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)