]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'rl1987/ticket26527'
authorNick Mathewson <nickm@torproject.org>
Tue, 3 Jul 2018 13:53:46 +0000 (09:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 3 Jul 2018 13:53:46 +0000 (09:53 -0400)

Trivial merge