]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/ticket27856'
authorNick Mathewson <nickm@torproject.org>
Tue, 9 Oct 2018 13:04:53 +0000 (09:04 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 9 Oct 2018 13:04:53 +0000 (09:04 -0400)

Trivial merge