]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.4' into master
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Nov 2020 21:17:50 +0000 (16:17 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Nov 2020 21:17:50 +0000 (16:17 -0500)

Trivial merge