Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5
commit0135fb028c8ca0ce310009f20efef89e53a36f2c
authorAlexander Færøy <ahf@torproject.org>
Thu, 21 Oct 2021 12:35:26 +0000 (21 12:35 +0000)
committerAlexander Færøy <ahf@torproject.org>
Thu, 21 Oct 2021 12:35:26 +0000 (21 12:35 +0000)
tree6aadf5f93ffc32d125125217420e3151512ba976
parent5717b88bcb88d374b7b934622f0b7bf62cdab05c
parent265cca935aefd1a3bdbe6abc964858e10fb4a029
Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5
src/app/config/config.c
src/feature/relay/router.c