]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/ticket27467'
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Sep 2018 13:24:47 +0000 (09:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Sep 2018 13:24:47 +0000 (09:24 -0400)

Trivial merge