Merge branch 'orbot' into 'master'

Orbot: replace Orweb with Lightning in description

The GuardianProject are abandoning Orweb in favor of Orfox, and they
advise those who want to use a webview based browser to use Lightning
See:
https://guardianproject.info/2015/06/30/orfox-aspiring-to-bring-tor-browser-to-android/

See merge request !874
This commit is contained in:
Boris Kraut 2015-07-18 08:50:23 +00:00
commit 7267b2c261

View file

@ -21,7 +21,7 @@ you can choose which apps go via the proxy in the settings.
If you don't have root access, there are some apps that are designed to work
closely with tor or allow proxied connections:
[[info.guardianproject.otr.app.im]], [[info.guardianproject.browser]] and
[[info.guardianproject.otr.app.im]], [[acr.browser.lightning]] and
[[org.mariotaku.twidere]].
There is also a proxy configurator addon for [[org.mozilla.firefox]] called
[https://github.com/guardianproject/ProxyMob/downloads ProxyMob] (not yet