]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug24582'
authorNick Mathewson <nickm@torproject.org>
Fri, 12 Jan 2018 00:57:57 +0000 (19:57 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 12 Jan 2018 00:57:57 +0000 (19:57 -0500)

Trivial merge