[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/84'

[asn at torproject.org]

commit 155e0dee49ad041707b8bc498d8fb6a82103800b
Merge: 9164d7c75e 219edc9ab1
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu Jul 30 19:49:25 2020 +0300

    Merge branch 'tor-gitlab/mr/84'

 src/feature/relay/relay_config.c | 51 ++++++++++++++++++++++++++++++++++------
 src/feature/relay/relay_config.h |  1 +
 src/test/test_config.c           | 34 +++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 7 deletions(-)