Directly use python’s urllib instead of curl in etc/dl-snapshot.py
auto merge of #899 : linkmauve/cargo/master, r=alexcrichton
Merge remote-tracking branch 'upstream/master' into curl-hack

Conflicts:
	src/etc/dl-snapshot.py