Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5
commit72484a4953d744754b3b6b025242ef668e3f017a
authorNick Mathewson <nickm@torproject.org>
Thu, 13 Aug 2020 18:20:27 +0000 (13 14:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 13 Aug 2020 18:20:27 +0000 (13 14:20 -0400)
treed334909e824c0e5f81091cb6501064b58f2df81e
parentaeafb7f44f07136101c06ea2986b295ef9915c9c
parentf9bb49d870045fa6e1a2570a65f0583066d8359d
Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5