]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'isis-github/bug26108'
authorNick Mathewson <nickm@torproject.org>
Wed, 16 May 2018 13:14:13 +0000 (09:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 16 May 2018 13:14:13 +0000 (09:14 -0400)

Trivial merge