Minor tuning.
Backport of connect timeout from dproxy branch.
Merged frostwire-common changes
Merge branch 'master' of github.com:frostwire/frostwire-desktop