]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug24953_squashed'
authorNick Mathewson <nickm@torproject.org>
Tue, 15 Jan 2019 13:25:35 +0000 (08:25 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 15 Jan 2019 13:25:35 +0000 (08:25 -0500)

Trivial merge