]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/860'
authorNick Mathewson <nickm@torproject.org>
Wed, 3 Apr 2019 12:33:40 +0000 (08:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 3 Apr 2019 12:33:40 +0000 (08:33 -0400)

Trivial merge