]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/ticket27211'
authorNick Mathewson <nickm@torproject.org>
Fri, 24 Aug 2018 16:45:42 +0000 (12:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 24 Aug 2018 16:45:42 +0000 (12:45 -0400)

Trivial merge