]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Aug 2020 16:40:02 +0000 (12:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Aug 2020 16:40:02 +0000 (12:40 -0400)

Trivial merge