]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/950'
authorNick Mathewson <nickm@torproject.org>
Wed, 1 May 2019 13:11:20 +0000 (09:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 May 2019 13:11:20 +0000 (09:11 -0400)

Trivial merge