]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug26986'
authorNick Mathewson <nickm@torproject.org>
Tue, 31 Jul 2018 12:50:38 +0000 (08:50 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 31 Jul 2018 12:50:38 +0000 (08:50 -0400)

Trivial merge