]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1430'
authorNick Mathewson <nickm@torproject.org>
Mon, 21 Oct 2019 16:43:26 +0000 (12:43 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 21 Oct 2019 16:43:26 +0000 (12:43 -0400)

Trivial merge