]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'catalyst-github/allow_fail_rust' into maint-0.3.4
authorNick Mathewson <nickm@torproject.org>
Thu, 21 Jun 2018 00:00:56 +0000 (20:00 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 21 Jun 2018 00:00:56 +0000 (20:00 -0400)

Trivial merge