]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
authorNick Mathewson <nickm@torproject.org>
Fri, 14 Feb 2020 13:16:01 +0000 (08:16 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 14 Feb 2020 13:16:01 +0000 (08:16 -0500)

Trivial merge