dl-snapshot: be more forgiving to triples
auto merge of #913 : jmesmon/cargo/forgive-wierd-triples, r=alexcrichton
Merge remote-tracking branch 'upstream/master'