]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug26924'
authorNick Mathewson <nickm@torproject.org>
Mon, 30 Jul 2018 12:44:58 +0000 (08:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 30 Jul 2018 12:44:58 +0000 (08:44 -0400)

Trivial merge