]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Jun 2019 12:41:48 +0000 (08:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Jun 2019 12:41:48 +0000 (08:41 -0400)

Trivial merge