commit 90c4702ff03336ea513397b537ea77df5260b9ec Merge: 4a7fcc7361 5887c1f1f3 Author: David Goulet dgoulet@torproject.org Date: Fri Feb 12 13:13:57 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

changes/ticket40289 | 6 ++++ src/app/config/config.c | 1 + src/feature/relay/relay_config.c | 69 ++++++++++++++++++++++++++++++++++++---- src/test/test_config.c | 4 ++- 4 files changed, 73 insertions(+), 7 deletions(-)