update the android page to point at working repos and apk files.
Andrew Lewman commited on 2013-02-07 03:36:29
Zeige 1 geänderte Dateien mit 7 Einfügungen und 19 Löschungen.
- docs/en/android.wml 182c07d66..edad86bc6
| ... | ... |
@@ -22,36 +22,29 @@ |
| 22 | 22 |
to the Android mobile operating system. |
| 23 | 23 |
</p> |
| 24 | 24 |
<p> |
| 25 |
- Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy |
|
| 25 |
+ Orbot contains Tor and libevent. Orbot provides a local HTTP proxy |
|
| 26 | 26 |
and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot |
| 27 | 27 |
has the ability to transparently torify all of the TCP traffic on your Android |
| 28 | 28 |
device when it has the correct permissions and system libraries. |
| 29 | 29 |
</p> |
| 30 | 30 |
|
| 31 |
- <a id="QrCode"></a> |
|
| 32 |
- <h2><a class="anchor" href="#QrCode">Installing Tor with a QR code</a></h2> |
|
| 31 |
+ <a id="F-Droid"></a> |
|
| 32 |
+ <h2><a class="anchor" href="fdroid">Installing Orbot from a F-Droid repository</a></h2> |
|
| 33 | 33 |
<br> |
| 34 |
- <p> |
|
| 35 |
- Orbot is easy to install by simply scanning the following QR code with your |
|
| 36 |
- Android Barcode scanner. |
|
| 37 |
- </p> |
|
| 38 |
- |
|
| 39 |
- <p> |
|
| 40 |
- <a href="$(IMGROOT)/android/orbot-qr-code-latest.png"><img alt="Android QR code" src="$(IMGROOT)/android/orbot-qr-code-latest.png"/></a> |
|
| 41 |
- </p> |
|
| 34 |
+ <p>Follow <a href="https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">these instructions</a> to install from Guardian Project's repository.</p> |
|
| 42 | 35 |
|
| 43 | 36 |
<a id="Market"></a> |
| 44 |
- <h2><a class="anchor" href="#Market">Installing Tor from the Android Market</a></h2> |
|
| 37 |
+ <h2><a class="anchor" href="#Market">Installing Orbot from the Android Market</a></h2> |
|
| 45 | 38 |
<br> |
| 46 | 39 |
<p> |
| 47 | 40 |
Orbot is available <a href="https://play.google.com/store/apps/details?id=org.torproject.android">in the Android Market</a>. |
| 48 | 41 |
</p> |
| 49 | 42 |
|
| 50 | 43 |
<a id="Manual"></a> |
| 51 |
- <h2><a class="anchor" href="#Manual">Installing Tor from our website manually</a></h2> |
|
| 44 |
+ <h2><a class="anchor" href="#Manual">Installing Tor from Guardian's website manually</a></h2> |
|
| 52 | 45 |
<br> |
| 53 | 46 |
<p> |
| 54 |
- You can download <a href="../<package-androidbundle-alpha>">our most recent version of Orbot</a> and <a href="../<package-androidbundle-alpha>.asc">the gpg signature</a> from our server. |
|
| 47 |
+ You can download the most recent version from the <a href="https://guardianproject.info/releases/">Guardian Project release</a> listing. |
|
| 55 | 48 |
</p> |
| 56 | 49 |
|
| 57 | 50 |
<a id="Screenshots"></a> |
| ... | ... |
@@ -90,11 +83,6 @@ |
| 90 | 83 |
<a id="Notes"></a> |
| 91 | 84 |
<h2><a class="anchor" href="#Notes">Platform specific notes</a></h2> |
| 92 | 85 |
<br> |
| 93 |
- <p> |
|
| 94 |
- The current version of Orbot ships with the following components: |
|
| 95 |
- <b><version-androidbundle-privoxy>, <version-androidbundle-libevent></b> |
|
| 96 |
- </p> |
|
| 97 |
- <br> |
|
| 98 | 86 |
<p> |
| 99 | 87 |
For standard Android 1.x devices: |
| 100 | 88 |
</p> |
| 101 | 89 |