]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket28177'
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Oct 2018 16:59:51 +0000 (12:59 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Oct 2018 16:59:51 +0000 (12:59 -0400)

Trivial merge