]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/887'
authorNick Mathewson <nickm@torproject.org>
Thu, 11 Apr 2019 18:29:16 +0000 (14:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Apr 2019 18:29:16 +0000 (14:29 -0400)

Trivial merge