Merge branch 'tor-gitlab/mr/50' into maint-0.3.5
commit9556276f07e62e8b2e6a496e9b2a918293367839
authorDavid Goulet <dgoulet@torproject.org>
Thu, 28 Jan 2021 17:46:24 +0000 (28 12:46 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 28 Jan 2021 17:46:24 +0000 (28 12:46 -0500)
tree7975fcdb2fa954722dc1628224f957bfed092a1c
parent290007e3c48624060620b0340c1b4874487aab09
parent623af0155e0664f46adb1fcc218bc193a9d15916
Merge branch 'tor-gitlab/mr/50' into maint-0.3.5