Merge branch 'tor-gitlab/mr/270' into maint-0.4.5
commitc54f4b81da5635b282fc45c6301c490663113434
authorDavid Goulet <dgoulet@torproject.org>
Thu, 21 Jan 2021 19:58:31 +0000 (21 14:58 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 21 Jan 2021 19:58:31 +0000 (21 14:58 -0500)
treeb166f137cc85ca852ac406edddc745c7000895e9
parent08c0ef61d8aa9490f78c3a77c1fbb86de09b1872
parent633b68bfe2cfaab41dc473923acc794e789a4c16
Merge branch 'tor-gitlab/mr/270' into maint-0.4.5