Merge pull request #338 from chris5560/master-app-privoxy