]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/260' into maint-0.4.5
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Jan 2021 17:02:21 +0000 (12:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Jan 2021 17:02:21 +0000 (12:02 -0500)

Trivial merge