update tor and user.lib
Merge branch 'master' of github.com:wuxxin/salt-shared

Conflicts:
	roles/desktop/security/user/tor-browser-bundle.sls