Merge remote-tracking branch 'tor-gitlab/mr/237' into maint-0.4.5
commit7998ea2f18dafc283b6fa6e66056d07d4f5963d3
authorAlexander Færøy <ahf@torproject.org>
Wed, 16 Dec 2020 20:29:03 +0000 (16 20:29 +0000)
committerAlexander Færøy <ahf@torproject.org>
Wed, 16 Dec 2020 20:29:03 +0000 (16 20:29 +0000)
treec8bf37cca779335f9ab3639c7019f3ccea37adbe
parent4a77aa6e8248f06e17a9a7375076b9d685a6b789
parent34baa1bdc38f95a784789b8b0244bab81f9a36af
Merge remote-tracking branch 'tor-gitlab/mr/237' into maint-0.4.5