]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.0' into release-0.4.0
authorNick Mathewson <nickm@torproject.org>
Fri, 5 Apr 2019 00:27:04 +0000 (20:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 5 Apr 2019 00:27:04 +0000 (20:27 -0400)

Trivial merge