Fixed compile error
Merge branch 'devel' of github.com:getlantern/lantern into devel
Added timeouts