]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/922'
authorNick Mathewson <nickm@torproject.org>
Fri, 26 Apr 2019 00:08:39 +0000 (20:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 26 Apr 2019 00:08:39 +0000 (20:08 -0400)

Trivial merge