[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/304' into maint-0.4.5

[dgoulet at torproject.org]

commit 5887c1f1f3f2c73e0750f0bf98431cba74e300bc
Merge: bdca475518 d47e937a50
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Feb 12 13:13:50 2021 -0500

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