getlantern/lantern#2065 Added timeout to upnpc call in go-igdman
getlantern/lantern#2065 Added timeout determineInternalIP in flashlight, along with comment exlaining what this function does
Merge branch 'master' into 2065
getlantern/lantern#2065 Added recent upnpc binary for OS X (version 1.0.20141027) along with script for embedding it and the original binary that was used for embedding
Merge branch '2065' of https://github.com/getlantern/flashlight-build into 2065
getlantern/lantern#2065 Updated README to discuss embedding upnpc
Merge branch 'master' into 2065
Replaced log with golog and added some trace logging
Merge pull request #5 from getlantern/2065

Closes getlantern/lantern#2065 Added timeout to upnpc call in go-igdman
Merged master to devel