]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.2' into release-0.4.2 release-0.4.2
authorNick Mathewson <nickm@torproject.org>
Thu, 13 Aug 2020 18:20:39 +0000 (14:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 13 Aug 2020 18:20:39 +0000 (14:20 -0400)

Trivial merge