]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Mon, 24 Jun 2019 17:36:10 +0000 (13:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 24 Jun 2019 17:36:10 +0000 (13:36 -0400)

Trivial merge