]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1446'
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:52:32 +0000 (12:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:52:32 +0000 (12:52 -0400)

Trivial merge