commit 46dca273214147233808bcddb82c8bf76e8d6db5 Merge: f91ea506f e23ff6d4c Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 20 20:00:56 2018 -0400

Merge remote-tracking branch 'catalyst-github/allow_fail_rust' into maint-0.3.4

.travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)