]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.0' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Nov 2019 15:14:04 +0000 (10:14 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Nov 2019 15:14:04 +0000 (10:14 -0500)

Trivial merge