typo
Merge branch 'master' of github.com:getlantern/lantern
Merge pull request #1501 from getlantern/proxy-connection-fix

Added unified token and proxy connection tracker and event generator
Merge branch 'master' of github.com:getlantern/lantern into startup-refactor