Fixed no-compile.

[This pull request][1] changed the timer function signatures. I make the
code build again.

[1]: https://github.com/rust-lang/rust/pull/15934
Merge branch 'master' into network

Conflicts:
	src/client.rs
	src/main.rs