commit 346cfbabe7fb1886fd6055c4f4d5459e1798f64f Merge: 7185860ef5 18654b629f Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 19 15:21:06 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

src/app/config/config.c | 16 ++++++-- src/feature/relay/relay_config.c | 25 ++++++++--- src/feature/relay/relay_config.h | 6 +++ src/test/test_config.c | 89 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 125 insertions(+), 11 deletions(-)