]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket31311_041' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Aug 2019 13:19:05 +0000 (09:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Aug 2019 13:19:05 +0000 (09:19 -0400)

Trivial merge