]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'release-0.4.0' of git-rw.torproject.org:/tor into release-0.4.0
authorNick Mathewson <nickm@torproject.org>
Tue, 30 Apr 2019 19:52:39 +0000 (15:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 30 Apr 2019 19:52:39 +0000 (15:52 -0400)

Trivial merge