]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.2' of git-rw.torproject.org:/tor into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Oct 2019 16:25:55 +0000 (12:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Oct 2019 16:25:55 +0000 (12:25 -0400)

Trivial merge