proxy stuff
more stuff
add comment
Merge pull request #536 from uProxy/salomegeo-generic-core

Distinguish between user stopped proxying and proxy session ended because of some error