Rust update.
Use indexing instead of get_mut since it now returns an Option
Merge pull request #169 from jamesrhurst/master

Use indexing instead of get_mut since it now returns an Option
Convert TmFmt from strftime to String. Fixes #170
Merge pull request #171 from Ogeon/master

Convert TmFmt from strftime to String. Fixes #170
Fix no-SSL build.
Merge upstream chris-morgan/rust-http into servo

Conflicts:
	codegen/src/branchify.rs
	src/http/client/sslclients/openssl.rs
	src/http/server/mod.rs
Merge pull request #37 from mbrubeck/merge

Merge upstream Android and rustup fixes