]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug31772_041' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Sep 2019 12:07:50 +0000 (08:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Sep 2019 12:07:50 +0000 (08:07 -0400)

Trivial merge