]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/410'
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Jul 2021 18:17:54 +0000 (14:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Jul 2021 18:17:54 +0000 (14:17 -0400)

Trivial merge