]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1317'
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Oct 2019 14:23:44 +0000 (10:23 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Oct 2019 14:23:44 +0000 (10:23 -0400)

Trivial merge