getlantern/lantern#1974 Added timeout to NAT-PMP logic
getlantern/lantern#1974 Code review updates
getlantern/lantern#1974 Code review updates
getlantern/lantern#1974 Moved timeout logic into withtimeout project
Killing on goroutine
Updated to latest withtimeout API
Merge branch 'master' into 1974
getlantern/lantern#1974 Tweaked unit test so it works on all of our platforms
Fixed test for Windows 64 bit
Merge pull request #3 from getlantern/1974

getlantern/lantern#1974 Added timeout to NAT-PMP logic