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

Trivial merge