]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket32386'
authorNick Mathewson <nickm@torproject.org>
Wed, 6 Nov 2019 23:29:16 +0000 (18:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 6 Nov 2019 23:29:16 +0000 (18:29 -0500)

Trivial merge