]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.2'
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:53:12 +0000 (12:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:53:12 +0000 (12:53 -0400)

Trivial merge