]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/964'
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Apr 2019 21:05:20 +0000 (17:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Apr 2019 21:05:20 +0000 (17:05 -0400)

Trivial merge