]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug32555'
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Nov 2019 18:31:32 +0000 (13:31 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Nov 2019 18:31:32 +0000 (13:31 -0500)

Trivial merge