Merge branch 'tor-gitlab/mr/392' into maint-0.4.6
commitfd3678fa60b3ba66fa414f86ce962f380ca6462e
authorDavid Goulet <dgoulet@torproject.org>
Thu, 27 May 2021 14:01:44 +0000 (27 10:01 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 27 May 2021 14:01:44 +0000 (27 10:01 -0400)
treea2eaf81a64fcd495e9fb6954ebeb9c28936ef610
parentbab2b29f89f21781a87010cf7120615615b90599
parentd12b16614d09b303f9ef9624107b589264537341
Merge branch 'tor-gitlab/mr/392' into maint-0.4.6
src/feature/control/control_getinfo.c
src/feature/dirclient/dirclient.c