]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/387' into maint-0.4.5
authorNick Mathewson <nickm@torproject.org>
Mon, 17 May 2021 13:09:42 +0000 (09:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 May 2021 13:09:42 +0000 (09:09 -0400)

Trivial merge