]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Apr 2019 14:15:03 +0000 (10:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Apr 2019 14:15:03 +0000 (10:15 -0400)

Trivial merge