]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/518'
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Nov 2018 13:45:41 +0000 (08:45 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Nov 2018 13:45:41 +0000 (08:45 -0500)

Trivial merge