@@ -29,7 +29,7 @@

     </p>

     <a id="F-Droid"></a>

-    <h2><a class="anchor" href="fdroid">Installing Orbot from a F-Droid repository</a></h2>

+    <h2><a class="anchor" href="#fdroid">Installing Orbot from a F-Droid repository</a></h2>

     <br>

     <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>

@@ -22,38 +22,31 @@

     to the Android mobile operating system.

     </p>

     <p>

-    Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy

+    Orbot contains Tor and libevent. Orbot provides a local HTTP proxy

     and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot

     has the ability to transparently torify all of the TCP traffic on your Android

     device when it has the correct permissions and system libraries.

     </p>

-    

-    <a id="QrCode"></a>

-    <h2><a class="anchor" href="#QrCode">Installing Tor with a QR code</a></h2>

+

+    <a id="F-Droid"></a>

+    <h2><a class="anchor" href="fdroid">Installing Orbot from a F-Droid repository</a></h2>

     <br>

-    <p>

-    Orbot is easy to install by simply scanning the following QR code with your

-    Android Barcode scanner.

-    </p>

-    

-    <p>

-    <a href="$(IMGROOT)/android/orbot-qr-code-latest.png"><img alt="Android QR code" src="$(IMGROOT)/android/orbot-qr-code-latest.png"/></a>

-    </p>

-    

+    <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>

+

     <a id="Market"></a>

-    <h2><a class="anchor" href="#Market">Installing Tor from the Android Market</a></h2>

+    <h2><a class="anchor" href="#Market">Installing Orbot from the Android Market</a></h2>

     <br>

     <p>

     Orbot is available <a href="https://play.google.com/store/apps/details?id=org.torproject.android">in the Android Market</a>.

     </p>

-    

+

     <a id="Manual"></a>

-    <h2><a class="anchor" href="#Manual">Installing Tor from our website manually</a></h2>

+    <h2><a class="anchor" href="#Manual">Installing Tor from Guardian's website manually</a></h2>

     <br>

     <p>

-    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.

+    You can download the most recent version from the <a href="https://guardianproject.info/releases/">Guardian Project release</a> listing.

     </p>

-    

+

     <a id="Screenshots"></a>

     <h2><a class="anchor" href="#Screenshots">Screenshots of Tor on Android</a></h2>

     <br>

@@ -73,7 +66,7 @@

     src="$(IMGROOT)/android/android-settings-150x150.jpg"/>

     </a>

     </p>

-    

+

     <a id="ProxySettings"></a>

     <h2><a class="anchor" href="#ProxySettings">Proxy settings and configuration

     </a></h2>

@@ -86,15 +79,10 @@

     <li>HTTP proxy 127.0.0.1:8118 </li>

     <li>Transparent proxying (on select devices)</li>

     </ul>

-    

+

     <a id="Notes"></a>

     <h2><a class="anchor" href="#Notes">Platform specific notes</a></h2>

     <br>

-    <p>

-    The current version of Orbot ships with the following components:

-    <b><version-androidbundle-privoxy>, <version-androidbundle-libevent></b>

-    </p>

-    <br>

     <p>

       For standard Android 1.x devices:

     </p>

@@ -111,10 +99,10 @@

     <li>For non-modified and non-rooted phones, you'll want to manually configure HTTP or SOCKS proxy settings for specific applications.</li>

     <li>If you root your device and install an iptables-capable ROM (such as <a href="http://www.cyanogenmod.com/">Cyanogen</a>), Orbot can transparently proxy traffic on an app-by-app basis through Tor.</li>

     <li>You can also install Firefox for Android from the market with the <a href="https://guardianproject.info/apps/proxymob">Proxy Mobile Add-on</a> or install the text-only “NDBrowser” from the Android Market.

-Both of these solutions all routing of web access through Tor on standard, un-rooted devices.</li> 

+Both of these solutions all routing of web access through Tor on standard, un-rooted devices.</li>

     <li>For Instant Messaging, try <a href="https://guardianproject.info/apps/gibber">Gibberbot</a>, which includes support for connecting via Tor and Off-the-Record encryption.</li>

     </ul>

-    

+

     <a id="Source"></a>

     <h2><a class="anchor" href="#Source">Source code access</a></h2>

     <br>

@@ -123,16 +111,16 @@ Both of these solutions all routing of web access through Tor on standard, un-ro

     href="https://gitweb.torproject.org/orbot.git">Orbot git

     repository.</a>.

     </p>

-    

+

     <p>

     Note that this might not always give you the latest stable Tor version.

     Additionally, the Android web browser does not have Torbutton. This means that

     while it may be useful for circumvention, it probably is unsuitable for strong

     web browser anonymity requirements.

     </p>

-    

+

     <hr>

-    

+

     <p>If you have suggestions for improving this document, please <a

     href="<page about/contact>">send them to us</a>. Thanks!</p>

   </div>

@@ -144,4 +132,4 @@ Both of these solutions all routing of web access through Tor on standard, un-ro

   <!-- END SIDECOL -->

 </div>

 <!-- END CONTENT -->

-#include <foot.wmi> 

+#include <foot.wmi>

@@ -44,7 +44,7 @@

     <h2><a class="anchor" href="#Market">Installing Tor from the Android Market</a></h2>

     <br>

     <p>

-    Orbot is available in the Android Market.

+    Orbot is available <a href="https://play.google.com/store/apps/details?id=org.torproject.android">in the Android Market</a>.

     </p>

     <a id="Manual"></a>

@@ -109,7 +109,7 @@

     <ul>

     <li>You must root your device and update the firmware to an iptables-capable ROM for Orbot to transparently proxy all TCP traffic.</li>

     <li>For non-modified and non-rooted phones, you'll want to manually configure HTTP or SOCKS proxy settings for specific applications.</li>

-    <li>If you root your device and install an iptables-capable ROM (such as <a href="http://cyanogenmod.com">Cyanogen</a>), Orbot can transparently proxy traffic on an app-by-app basis through Tor.</li>

+    <li>If you root your device and install an iptables-capable ROM (such as <a href="http://www.cyanogenmod.com/">Cyanogen</a>), Orbot can transparently proxy traffic on an app-by-app basis through Tor.</li>

     <li>You can also install Firefox for Android from the market with the <a href="https://guardianproject.info/apps/proxymob">Proxy Mobile Add-on</a> or install the text-only “NDBrowser” from the Android Market.

 Both of these solutions all routing of web access through Tor on standard, un-rooted devices.</li> 

     <li>For Instant Messaging, try <a href="https://guardianproject.info/apps/gibber">Gibberbot</a>, which includes support for connecting via Tor and Off-the-Record encryption.</li>

@@ -119,9 +119,9 @@ Both of these solutions all routing of web access through Tor on standard, un-ro

     <h2><a class="anchor" href="#Source">Source code access</a></h2>

     <br>

     <p>

-    All of the source code is available in the

-    <a href="https://svn.torproject.org/svn/projects/android/trunk/Orbot/">Orbot

-    subversion repository</a>.

+    All of the source code is available in the <a

+    href="https://gitweb.torproject.org/orbot.git">Orbot git

+    repository.</a>.

     </p>

     <p>

@@ -110,7 +110,7 @@

     <li>You must root your device and update the firmware to an iptables-capable ROM for Orbot to transparently proxy all TCP traffic.</li>

     <li>For non-modified and non-rooted phones, you'll want to manually configure HTTP or SOCKS proxy settings for specific applications.</li>

     <li>If you root your device and install an iptables-capable ROM (such as <a href="http://cyanogenmod.com">Cyanogen</a>), Orbot can transparently proxy traffic on an app-by-app basis through Tor.</li>

-    <li>You can also install Firefox for Android from the market with the <a href="https://guardianproject.info/apps/proxymob">ProxyMob Add-on</a> or install the text-only “NDBrowser” from the Android Market.

+    <li>You can also install Firefox for Android from the market with the <a href="https://guardianproject.info/apps/proxymob">Proxy Mobile Add-on</a> or install the text-only “NDBrowser” from the Android Market.

 Both of these solutions all routing of web access through Tor on standard, un-rooted devices.</li> 

     <li>For Instant Messaging, try <a href="https://guardianproject.info/apps/gibber">Gibberbot</a>, which includes support for connecting via Tor and Off-the-Record encryption.</li>

     </ul>

@@ -109,8 +109,9 @@

     <ul>

     <li>You must root your device and update the firmware to an iptables-capable ROM for Orbot to transparently proxy all TCP traffic.</li>

     <li>For non-modified and non-rooted phones, you'll want to manually configure HTTP or SOCKS proxy settings for specific applications.</li>

-    <li>If you root your device and install an iptables-capable ROM (such as <a href="http://cyanogenmod.com">Cyanogen<a/>), Orbot can transparently proxy traffic on an app-by-app basis through Tor.</li>

-    <li>You can also install Firefox for Android from the market with the <a href="https://guardianproject.info/apps/proxymob">ProxyMob Add-on</a> or install the text-only “NDBrowser” from the Android Market. Both of these solutions all routing of web access through Tor on standard, un-rooted devices. 

+    <li>If you root your device and install an iptables-capable ROM (such as <a href="http://cyanogenmod.com">Cyanogen</a>), Orbot can transparently proxy traffic on an app-by-app basis through Tor.</li>

+    <li>You can also install Firefox for Android from the market with the <a href="https://guardianproject.info/apps/proxymob">ProxyMob Add-on</a> or install the text-only “NDBrowser” from the Android Market.

+Both of these solutions all routing of web access through Tor on standard, un-rooted devices.</li> 

     <li>For Instant Messaging, try <a href="https://guardianproject.info/apps/gibber">Gibberbot</a>, which includes support for connecting via Tor and Off-the-Record encryption.</li>

     </ul>

@@ -25,7 +25,7 @@

     Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy

     and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot

     has the ability to transparently torify all of the TCP traffic on your Android

-    device when it has the correct permissions.

+    device when it has the correct permissions and system libraries.

     </p>

     <a id="QrCode"></a>

@@ -96,26 +96,22 @@

     </p>

     <br>

     <p>

-      For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, Moment):

+      For standard Android 1.x devices:

     </p>

     <ul>

-    <li>The “ProxySurf” browser available in the Android Market allows for use

-        of a proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'.

-        <b>This only proxies some traffic and should not be considered secure.</b>

+    <li>The Orweb browser available in the Android Market integrates directly with Orbot, and offers a number of other privacy-oriented features.

         </li>

-    <li>For Instant Messsaging, try “Beem” in the market, and set the Proxy to SOCKS5 '127.0.0.1' and port '9050'.</li>

+    <li>For Instant Messsaging, try <a href="https://guardianproject.info/apps/gibber">Gibberbot</a>, which includes support for connecting via Tor and Off-the-Record encryption.</li>

     </ul>

     <p>

-      For Android 2.x devices: Droid, Nexus One

+      For Android 2.x devices:

     </p>

     <ul>

-    <li>You must root your device for Orbot to transparently proxy all TCP traffic.</li>

-    <li>For non-modified and non-rooted phones, you'll want to manually configure

-        your specific applications.</li>

-    <li>If you root your device, whether it is 1.x or 2.x based, Orbot will

-        automatically, transparently proxy all web traffic on port 80 and 443

-        and all DNS requests. This includes the built-in Browser, Gmail, YouTube,

-        Maps and any other application that uses standard web traffic.</li>

+    <li>You must root your device and update the firmware to an iptables-capable ROM for Orbot to transparently proxy all TCP traffic.</li>

+    <li>For non-modified and non-rooted phones, you'll want to manually configure HTTP or SOCKS proxy settings for specific applications.</li>

+    <li>If you root your device and install an iptables-capable ROM (such as <a href="http://cyanogenmod.com">Cyanogen<a/>), Orbot can transparently proxy traffic on an app-by-app basis through Tor.</li>

+    <li>You can also install Firefox for Android from the market with the <a href="https://guardianproject.info/apps/proxymob">ProxyMob Add-on</a> or install the text-only “NDBrowser” from the Android Market. Both of these solutions all routing of web access through Tor on standard, un-rooted devices. 

+    <li>For Instant Messaging, try <a href="https://guardianproject.info/apps/gibber">Gibberbot</a>, which includes support for connecting via Tor and Off-the-Record encryption.</li>

     </ul>

     <a id="Source"></a>

@@ -51,7 +51,7 @@

     <h2><a class="anchor" href="#Manual">Installing Tor from our website manually</a></h2>

     <br>

     <p>

-    You can download <a href="../<package-androidbundle-alpha>">our most recent version of Orbot</a> and <a href="../<package-androidbundle-alpha-sig>">the gpg signature</a> from our server.

+    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.

     </p>

     <a id="Screenshots"></a>

@@ -44,8 +44,7 @@

     <h2><a class="anchor" href="#Market">Installing Tor from the Android Market</a></h2>

     <br>

     <p>

-    Orbot is not currently in the Android Market. It will be available in the

-    market in the very near future.

+    Orbot is available in the Android Market.

     </p>

     <a id="Manual"></a>

@@ -1,5 +1,5 @@

 ## translation metadata

-# Revision: $Revision: 22402 $

+# Revision: $Revision$

 # Translation-Priority: 3-low

 #include "head.wmi" TITLE="Tor Project: Android Instructions" CHARSET="UTF-8"

@@ -118,7 +118,6 @@

         and all DNS requests. This includes the built-in Browser, Gmail, YouTube,

         Maps and any other application that uses standard web traffic.</li>

     </ul>

-    </p>

     <a id="Source"></a>

     <h2><a class="anchor" href="#Source">Source code access</a></h2>

@@ -37,10 +37,7 @@

     </p>

     <p>

-    <a href="$(IMGROOT)/android/orbot-qr-code-latest.png">

-    <img alt="Android QR code"

-    src="$(IMGROOT)/android/orbot-qr-code-latest.png"/>

-    </a>

+    <a href="$(IMGROOT)/android/orbot-qr-code-latest.png"><img alt="Android QR code" src="$(IMGROOT)/android/orbot-qr-code-latest.png"/></a>

     </p>

     <a id="Market"></a>

@@ -63,12 +60,10 @@

     <br>

     <p>

     <a href="$(IMGROOT)/android/android-off.jpg">

-    <img alt="Android Tor off"

-    src="$(IMGROOT)/android/android-off-150x150.jpg"/>

+    <img alt="Android Tor off" src="$(IMGROOT)/android/android-off-150x150.jpg"/>

     </a>

     <a href="$(IMGROOT)/android/android-bootstrapping.jpg">

-    <img alt="Android Tor bootstrapping"

-    src="$(IMGROOT)/android/android-bootstrapping-150x150.jpg"/>

+    <img alt="Android Tor bootstrapping" src="$(IMGROOT)/android/android-bootstrapping-150x150.jpg"/>

     </a>

     <a href="$(IMGROOT)/android/android-activated.jpg">

     <img alt="Android Tor activated"

@@ -85,13 +85,13 @@

     </a></h2>

     <br>

     <p>

-    Orbot offers three interfaces into the Tor network:

+      Orbot offers three interfaces into the Tor network:

+    </p>

     <ul>

     <li>SOCKS 4A/5 proxy 127.0.0.1:9050</li>

     <li>HTTP proxy 127.0.0.1:8118 </li>

     <li>Transparent proxying (on select devices)</li>

     </ul>

-    </p>

     <a id="Notes"></a>

     <h2><a class="anchor" href="#Notes">Platform specific notes</a></h2>

@@ -102,7 +102,8 @@

     </p>

     <br>

     <p>

-    For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, Moment):

+      For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, Moment):

+    </p>

     <ul>

     <li>The “ProxySurf” browser available in the Android Market allows for use

         of a proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'.

@@ -110,9 +111,9 @@

         </li>

     <li>For Instant Messsaging, try “Beem” in the market, and set the Proxy to SOCKS5 '127.0.0.1' and port '9050'.</li>

     </ul>

-    </p>

     <p>

-    For Android 2.x devices: Droid, Nexus One

+      For Android 2.x devices: Droid, Nexus One

+    </p>

     <ul>

     <li>You must root your device for Orbot to transparently proxy all TCP traffic.</li>

     <li>For non-modified and non-rooted phones, you'll want to manually configure

@@ -98,7 +98,7 @@

     <br>

     <p>

     The current version of Orbot ships with the following components:

-    <b><version-android-components></b>

+    <b><version-androidbundle-privoxy>, <version-androidbundle-libevent></b>

     </p>

     <br>

     <p>

@@ -38,7 +38,7 @@

     <p>

     <a href="$(IMGROOT)/android/orbot-qr-code-latest.png">

-    <img border="0" alt="Android QR code"

+    <img alt="Android QR code"

     src="$(IMGROOT)/android/orbot-qr-code-latest.png"/>

     </a>

     </p>

@@ -63,19 +63,19 @@

     <br>

     <p>

     <a href="$(IMGROOT)/android/android-off.jpg">

-    <img border="0" alt="Android Tor off"

+    <img alt="Android Tor off"

     src="$(IMGROOT)/android/android-off-150x150.jpg"/>

     </a>

     <a href="$(IMGROOT)/android/android-bootstrapping.jpg">

-    <img border="0" alt="Android Tor bootstrapping"

+    <img alt="Android Tor bootstrapping"

     src="$(IMGROOT)/android/android-bootstrapping-150x150.jpg"/>

     </a>

     <a href="$(IMGROOT)/android/android-activated.jpg">

-    <img border="0" alt="Android Tor activated"

+    <img alt="Android Tor activated"

     src="$(IMGROOT)/android/android-activated-150x150.jpg"/>

     </a>

     <a href="$(IMGROOT)/android/android-settings.jpg">

-    <img border="0" alt="Android Tor settings"

+    <img alt="Android Tor settings"

     src="$(IMGROOT)/android/android-settings-150x150.jpg"/>

     </a>

     </p>

@@ -11,7 +11,7 @@

   </div>

   <div id="maincol">

     <h2><a class="anchor" href="#Android">Tor on Android</a></h2>

-    <br />

+    <br>

     <p>

     Tor is available for Android by installing our package named Orbot.

     </p>

@@ -30,7 +30,7 @@

     <a id="QrCode"></a>

     <h2><a class="anchor" href="#QrCode">Installing Tor with a QR code</a></h2>

-    <br />

+    <br>

     <p>

     Orbot is easy to install by simply scanning the following QR code with your

     Android Barcode scanner.

@@ -45,7 +45,7 @@

     <a id="Market"></a>

     <h2><a class="anchor" href="#Market">Installing Tor from the Android Market</a></h2>

-    <br />

+    <br>

     <p>

     Orbot is not currently in the Android Market. It will be available in the

     market in the very near future.

@@ -53,14 +53,14 @@

     <a id="Manual"></a>

     <h2><a class="anchor" href="#Manual">Installing Tor from our website manually</a></h2>

-    <br />

+    <br>

     <p>

     You can download <a href="../<package-androidbundle-alpha>">our most recent version of Orbot</a> and <a href="../<package-androidbundle-alpha-sig>">the gpg signature</a> from our server.

     </p>

     <a id="Screenshots"></a>

     <h2><a class="anchor" href="#Screenshots">Screenshots of Tor on Android</a></h2>

-    <br />

+    <br>

     <p>

     <a href="$(IMGROOT)/android/android-off.jpg">

     <img border="0" alt="Android Tor off"

@@ -83,7 +83,7 @@

     <a id="ProxySettings"></a>

     <h2><a class="anchor" href="#ProxySettings">Proxy settings and configuration

     </a></h2>

-    <br />

+    <br>

     <p>

     Orbot offers three interfaces into the Tor network:

     <ul>

@@ -95,12 +95,12 @@

     <a id="Notes"></a>

     <h2><a class="anchor" href="#Notes">Platform specific notes</a></h2>

-    <br />

+    <br>

     <p>

     The current version of Orbot ships with the following components:

     <b><version-android-components></b>

     </p>

-    <br />

+    <br>

     <p>

     For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, Moment):

     <ul>

@@ -126,7 +126,7 @@

     <a id="Source"></a>

     <h2><a class="anchor" href="#Source">Source code access</a></h2>

-    <br />

+    <br>

     <p>

     All of the source code is available in the

     <a href="https://svn.torproject.org/svn/projects/android/trunk/Orbot/">Orbot

@@ -140,7 +140,7 @@

     web browser anonymity requirements.

     </p>

-    <hr />

+    <hr>

     <p>If you have suggestions for improving this document, please <a

     href="<page about/contact>">send them to us</a>. Thanks!</p>

@@ -37,9 +37,9 @@

     </p>

     <p>

-    <a href="../images/android/orbot-qr-code-latest.png">

+    <a href="$(IMGROOT)/android/orbot-qr-code-latest.png">

     <img border="0" alt="Android QR code"

-    src="../images/android/orbot-qr-code-latest.png"/>

+    src="$(IMGROOT)/android/orbot-qr-code-latest.png"/>

     </a>

     </p>

@@ -62,21 +62,21 @@

     <h2><a class="anchor" href="#Screenshots">Screenshots of Tor on Android</a></h2>

     <br />

     <p>

-    <a href="../images/android/android-off.jpg">

+    <a href="$(IMGROOT)/android/android-off.jpg">

     <img border="0" alt="Android Tor off"

-    src="../images/android/android-off-150x150.jpg"/>

+    src="$(IMGROOT)/android/android-off-150x150.jpg"/>

     </a>

-    <a href="../images/android/android-bootstrapping.jpg">

+    <a href="$(IMGROOT)/android/android-bootstrapping.jpg">

     <img border="0" alt="Android Tor bootstrapping"

-    src="../images/android/android-bootstrapping-150x150.jpg"/>

+    src="$(IMGROOT)/android/android-bootstrapping-150x150.jpg"/>

     </a>

-    <a href="../images/android/android-activated.jpg">

+    <a href="$(IMGROOT)/android/android-activated.jpg">

     <img border="0" alt="Android Tor activated"

-    src="../images/android/android-activated-150x150.jpg"/>

+    src="$(IMGROOT)/android/android-activated-150x150.jpg"/>

     </a>

-    <a href="../images/android/android-settings.jpg">

+    <a href="$(IMGROOT)/android/android-settings.jpg">

     <img border="0" alt="Android Tor settings"

-    src="../images/android/android-settings-150x150.jpg"/>

+    src="$(IMGROOT)/android/android-settings-150x150.jpg"/>

     </a>

     </p>

@@ -37,9 +37,9 @@

     </p>

     <p>

-    <a href="../img/android/orbot-qr-code-latest.png">

+    <a href="../images/android/orbot-qr-code-latest.png">

     <img border="0" alt="Android QR code"

-    src="../img/android/orbot-qr-code-latest.png"/>

+    src="../images/android/orbot-qr-code-latest.png"/>

     </a>

     </p>

@@ -62,21 +62,21 @@

     <h2><a class="anchor" href="#Screenshots">Screenshots of Tor on Android</a></h2>

     <br />

     <p>

-    <a href="../img/android/android-off.jpg">

+    <a href="../images/android/android-off.jpg">

     <img border="0" alt="Android Tor off"

-    src="../img/android/android-off-150x150.jpg"/>

+    src="../images/android/android-off-150x150.jpg"/>

     </a>

-    <a href="../img/android/android-bootstrapping.jpg">

+    <a href="../images/android/android-bootstrapping.jpg">

     <img border="0" alt="Android Tor bootstrapping"

-    src="../img/android/android-bootstrapping-150x150.jpg"/>

+    src="../images/android/android-bootstrapping-150x150.jpg"/>

     </a>

-    <a href="../img/android/android-activated.jpg">

+    <a href="../images/android/android-activated.jpg">

     <img border="0" alt="Android Tor activated"

-    src="../img/android/android-activated-150x150.jpg"/>

+    src="../images/android/android-activated-150x150.jpg"/>

     </a>

-    <a href="../img/android/android-settings.jpg">

+    <a href="../images/android/android-settings.jpg">

     <img border="0" alt="Android Tor settings"

-    src="../img/android/android-settings-150x150.jpg"/>

+    src="../images/android/android-settings-150x150.jpg"/>

     </a>

     </p>

@@ -5,7 +5,7 @@

 #include "head.wmi" TITLE="Tor Project: Android Instructions" CHARSET="UTF-8"

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

-    <a href="<page home>">Home &raquo; </a>

+    <a href="<page index>">Home &raquo; </a>

     <a href="<page docs/documentation>">Documentation &raquo; </a>

     <a href="<page docs/android>">Android</a>

   </div>

new file mode 100644

@@ -0,0 +1,156 @@

+## translation metadata

+# Revision: $Revision: 22402 $

+# Translation-Priority: 3-low

+

+#include "head.wmi" TITLE="Tor Project: Android Instructions" CHARSET="UTF-8"

+<div id="content" class="clearfix">

+  <div id="breadcrumbs">

+    <a href="<page home>">Home &raquo; </a>

+    <a href="<page docs/documentation>">Documentation &raquo; </a>

+    <a href="<page docs/android>">Android</a>

+  </div>

+  <div id="maincol">

+    <h2><a class="anchor" href="#Android">Tor on Android</a></h2>

+    <br />

+    <p>

+    Tor is available for Android by installing our package named Orbot.

+    </p>

+    <p>

+    Orbot is an application that allows mobile phone users to access the web,

+    instant messaging and email without being monitored or blocked by their mobile

+    internet service provider. Orbot brings the features and functionality of Tor

+    to the Android mobile operating system.

+    </p>

+    <p>

+    Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy

+    and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot

+    has the ability to transparently torify all of the TCP traffic on your Android

+    device when it has the correct permissions.

+    </p>

+    

+    <a id="QrCode"></a>

+    <h2><a class="anchor" href="#QrCode">Installing Tor with a QR code</a></h2>

+    <br />

+    <p>

+    Orbot is easy to install by simply scanning the following QR code with your

+    Android Barcode scanner.

+    </p>

+    

+    <p>

+    <a href="../img/android/orbot-qr-code-latest.png">

+    <img border="0" alt="Android QR code"

+    src="../img/android/orbot-qr-code-latest.png"/>

+    </a>

+    </p>

+    

+    <a id="Market"></a>

+    <h2><a class="anchor" href="#Market">Installing Tor from the Android Market</a></h2>

+    <br />

+    <p>

+    Orbot is not currently in the Android Market. It will be available in the

+    market in the very near future.

+    </p>

+    

+    <a id="Manual"></a>

+    <h2><a class="anchor" href="#Manual">Installing Tor from our website manually</a></h2>

+    <br />

+    <p>

+    You can download <a href="../<package-androidbundle-alpha>">our most recent version of Orbot</a> and <a href="../<package-androidbundle-alpha-sig>">the gpg signature</a> from our server.

+    </p>

+    

+    <a id="Screenshots"></a>

+    <h2><a class="anchor" href="#Screenshots">Screenshots of Tor on Android</a></h2>

+    <br />

+    <p>

+    <a href="../img/android/android-off.jpg">

+    <img border="0" alt="Android Tor off"

+    src="../img/android/android-off-150x150.jpg"/>

+    </a>

+    <a href="../img/android/android-bootstrapping.jpg">

+    <img border="0" alt="Android Tor bootstrapping"

+    src="../img/android/android-bootstrapping-150x150.jpg"/>

+    </a>

+    <a href="../img/android/android-activated.jpg">

+    <img border="0" alt="Android Tor activated"

+    src="../img/android/android-activated-150x150.jpg"/>

+    </a>

+    <a href="../img/android/android-settings.jpg">

+    <img border="0" alt="Android Tor settings"

+    src="../img/android/android-settings-150x150.jpg"/>

+    </a>

+    </p>

+    

+    <a id="ProxySettings"></a>

+    <h2><a class="anchor" href="#ProxySettings">Proxy settings and configuration

+    </a></h2>

+    <br />

+    <p>

+    Orbot offers three interfaces into the Tor network:

+    <ul>

+    <li>SOCKS 4A/5 proxy 127.0.0.1:9050</li>

+    <li>HTTP proxy 127.0.0.1:8118 </li>

+    <li>Transparent proxying (on select devices)</li>

+    </ul>

+    </p>

+    

+    <a id="Notes"></a>

+    <h2><a class="anchor" href="#Notes">Platform specific notes</a></h2>

+    <br />

+    <p>

+    The current version of Orbot ships with the following components:

+    <b><version-android-components></b>

+    </p>

+    <br />

+    <p>

+    For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, Moment):

+    <ul>

+    <li>The “ProxySurf” browser available in the Android Market allows for use

+        of a proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'.

+        <b>This only proxies some traffic and should not be considered secure.</b>

+        </li>

+    <li>For Instant Messsaging, try “Beem” in the market, and set the Proxy to SOCKS5 '127.0.0.1' and port '9050'.</li>

+    </ul>

+    </p>

+    <p>

+    For Android 2.x devices: Droid, Nexus One

+    <ul>

+    <li>You must root your device for Orbot to transparently proxy all TCP traffic.</li>

+    <li>For non-modified and non-rooted phones, you'll want to manually configure

+        your specific applications.</li>

+    <li>If you root your device, whether it is 1.x or 2.x based, Orbot will

+        automatically, transparently proxy all web traffic on port 80 and 443

+        and all DNS requests. This includes the built-in Browser, Gmail, YouTube,

+        Maps and any other application that uses standard web traffic.</li>

+    </ul>

+    </p>

+    

+    <a id="Source"></a>

+    <h2><a class="anchor" href="#Source">Source code access</a></h2>

+    <br />

+    <p>

+    All of the source code is available in the

+    <a href="https://svn.torproject.org/svn/projects/android/trunk/Orbot/">Orbot

+    subversion repository</a>.

+    </p>

+    

+    <p>

+    Note that this might not always give you the latest stable Tor version.

+    Additionally, the Android web browser does not have Torbutton. This means that

+    while it may be useful for circumvention, it probably is unsuitable for strong

+    web browser anonymity requirements.

+    </p>

+    

+    <hr />

+    

+    <p>If you have suggestions for improving this document, please <a

+    href="<page about/contact>">send them to us</a>. Thanks!</p>

+  </div>

+  <!-- END MAINCOL -->

+  <div id = "sidecol">

+#include "side.wmi"

+#include "info.wmi"

+  </div>

+  <!-- END SIDECOL -->

+</div>

+<!-- END CONTENT -->

+#include <foot.wmi>