Merge remote-tracking branch 'tor-gitlab/mr/196' into maint-0.4.3
commit2e7cbd7a9c4672d334a5900be2d2f4be26e603a3
authorAlexander Færøy <ahf@torproject.org>
Thu, 19 Nov 2020 17:43:44 +0000 (19 17:43 +0000)
committerAlexander Færøy <ahf@torproject.org>
Thu, 19 Nov 2020 17:43:44 +0000 (19 17:43 +0000)
treea9452a3d8d5154da59a8853ac854fa82a9d6cd9b
parent7c0778ef7e05e859c62346a795952f127972b35e
parent4154158d79452a5026c25750fae220a529c00fa3
Merge remote-tracking branch 'tor-gitlab/mr/196' into maint-0.4.3