]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/195' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Nov 2020 03:42:15 +0000 (22:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Nov 2020 03:42:15 +0000 (22:42 -0500)

Trivial merge