]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1426' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Oct 2019 16:32:29 +0000 (12:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Oct 2019 16:32:29 +0000 (12:32 -0400)

Trivial merge