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

Trivial merge