[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

[nickm at torproject.org]

commit 9a0a91dc23ac465d8e834c0c200eea46db3cdf02
Merge: b0af4ddc7c 18654b629f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 19 15:21:07 2021 -0500

    Merge branch '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(-)