getlantern/lantern#1974 Code review updates
getlantern/lantern#1974 Moved timeout logic into withtimeout project