]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug24762'
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Jan 2018 14:54:56 +0000 (09:54 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Jan 2018 14:54:56 +0000 (09:54 -0500)

Trivial merge