]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/comment24575'
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 14:46:23 +0000 (09:46 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 14:46:23 +0000 (09:46 -0500)

Trivial merge