]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/339'
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Mar 2021 16:23:30 +0000 (12:23 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Mar 2021 16:23:30 +0000 (12:23 -0400)

Trivial merge