]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket31552_041' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 22:54:05 +0000 (18:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 22:54:05 +0000 (18:54 -0400)

Trivial merge