Merge branch 'tor-gitlab/mr/489'
commit4f038d224f5a3df5fb396eff0173bba0eec89127
authorDavid Goulet <dgoulet@torproject.org>
Mon, 16 May 2022 12:51:00 +0000 (16 08:51 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 16 May 2022 12:51:00 +0000 (16 08:51 -0400)
treef83d971042e41cd9a1e9b9d053fb7522f27d828c
parentbae04e6a988dfb5deea86bb848b1649d3b3c3551
parent96f1e69f24ec5c056964b44cb8538004649c504d
Merge branch 'tor-gitlab/mr/489'
src/feature/nodelist/networkstatus.c
src/feature/relay/router.c