]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket34382' into maint-0.4.4
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Jun 2020 16:29:39 +0000 (12:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Jun 2020 16:29:39 +0000 (12:29 -0400)

Trivial merge