561db261d3 `timeout()` and `socks()` don't return Result (Riccardo Casatta)
Pull request description:
The `Result` was necessary in the past because they couldn't both be set,
this is not true anymore after 7493630ed8
ACKs for top commit:
afilini:
ACK 561db261d3
Tree-SHA512: 7654cfbbc7beac6acec786060e373bbc046e1dae0faf2b2ca1df33121e9e92a8f4950c7f8775e44226a62483aeae41c76162cf037ce38137c44d2fedd38560c8