]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Wed, 6 Nov 2019 13:57:14 +0000 (08:57 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 6 Nov 2019 13:57:14 +0000 (08:57 -0500)

Trivial merge