]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/24805-phoul'
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Dec 2018 14:38:27 +0000 (09:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Dec 2018 14:38:27 +0000 (09:38 -0500)

Trivial merge