[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/266' into maint-0.4.5

[nickm at torproject.org]

commit 18654b629f5fdc3f40ca64e41d0e61ea4c7dc6ef
Merge: 27ee12836d 9321ddf3a1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 19 15:20:54 2021 -0500

    Merge remote-tracking branch 'tor-gitlab/mr/266' into maint-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(-)