]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/ticket26852'
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Jul 2018 17:20:23 +0000 (13:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Jul 2018 17:20:23 +0000 (13:20 -0400)

Trivial merge