udpate gradle depend version to 0.3.4.8-2

updated torrc defaults
updated bridges
2018-10-11 23:10:09 -04:00 · 2018-10-11 23:09:32 -04:00 · 2018-10-11 23:08:38 -04:00 · 2018-10-11 16:51:11 -04:00 · 2018-10-11 16:50:58 -04:00 · 2018-10-11 09:27:52 -04:00
155 changed files with 212142 additions and 7137 deletions
--- a/.classpath
+++ b/.classpath
@ -1,9 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="libs/asocks.jar"/>
 	<classpathentry kind="lib" path="libs/jtorctrl.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,68 @@
 # auto-generated files from Android builds
 build.xml
 ant.properties
 default.properties
 proguard.cfg
 proguard-project.txt
 #
 releases
 docs
 doc
 .directory
 #built application files
 *.apk
 *.ap_
 # files for the dex VM
 *.dex
 # Java class files
 *.class
 # subdirs for generated files
 bin/
 gen/
 # Local configuration file (sdk path, etc)
 local.properties
 # Windows thumbnail db
 Thumbs.db
 # OSX files
 .DS_Store
 # Android Studio
 *.iml
 .idea/
 .gradle/
 build/
 #tfx
 .transifexrc
 /external/appcompat/bin/
 /external/appcompat/gen/
 /external/bin/
 /external/include/
 /external/*-build-stamp
 /external/lib/
 /external/privoxy/
 /external/test.c
 /external/test.h.gch
 /external/translation/
 bin
 gen
 native
 libs/jtorctl.jar
 local.properties
 builds
 external/patches/*
 obj
 app/src/main/jniLibs/
 app/src/main/libs/
 orbotservice/src/main/libs/
 orbotservice/src/main/jniLibs/
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,20 @@
 [submodule "external/tor"]
 	path = external/tor
 	url = https://git.torproject.org/git/tor.git
 	ignore = dirty
 [submodule "external/libevent"]
 	path = external/libevent
 	url = https://github.com/libevent/libevent.git
 	ignore = dirty
 [submodule "external/openssl"]
 	path = external/openssl
 	url = https://github.com/openssl/openssl.git
 	ignore = dirty
 [submodule "external/zstd"]
 	path = external/zstd
 	url = https://github.com/facebook/zstd.git
 	ignore = dirty
 [submodule "external/xz"]
 	path = external/xz
 	url = https://git.tukaani.org/xz.git
 	ignore = dirty
--- a/.project
+++ b/.project
@ -5,6 +5,16 @@
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
 			<triggers>full,incremental,</triggers>
 			<arguments>
 				<dictionary>
 					<key>LaunchConfigHandle</key>
 					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.genmakebuilder.launch</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
 			<arguments>
@ -30,10 +40,40 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
 			<triggers>full,incremental,</triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.eclipse.cdt.core.cnature</nature>
 		<nature>org.eclipse.cdt.core.ccnature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
 			<id>1451443416388</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-name-matches-false-false-external</arguments>
 			</matcher>
 		</filter>
 		<filter>
 			<id>1451443416398</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-name-matches-false-false-jni</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
 </projectDescription>
--- a/.settings/.jsdtscope
+++ b/.settings/.jsdtscope
@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
 		<attributes>
 			<attribute name="hide" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
 	<classpathentry kind="output" path=""/>
 </classpath>
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@ -1 +0,0 @@
 org.eclipse.wst.jsdt.launching.baseBrowserLibrary
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@ -1 +0,0 @@
 Window
--- a/23
+++ b/23
@ -1,12 +1,11 @@
 This file lists the authors for Orbot, a free software project to provide
 anonymity on the Internet on Android smartphones.
-For more information about Orbot, see http://guardianproject.info/
+For more information about Orbot, see https://guardianproject.info/apps/orbot
 If you got this file as a part of a larger bundle, there are probably
 other authors that you should be aware of.
 Main Authors:
 -------------
 Nathan Freitas <nathan@freitas.net> developed the primary Android
@ -17,11 +16,29 @@ in the rear to get this done. He has also provided extensive guidance
 and review. Most recently he has been promoted to Chief Application
 Resource Editor.
 Derek Halliday <derek@guardianproject.info> has designed and implemented
 new user interface components and layouts since the 1.0.4 release. 
 Contributors:
 -------------
 Nick Mathewson <nickm@freehaven.net> wrote some of the patch code to
 support the compiling of Tor and Libevent on Android, and generally
 provided guidance in the entire effort.
-Adam Langley <> made the original valiant effort to port Tor to Android.
+Adam Langley made the original valiant effort to port Tor to Android.
 Sathyanarayanan <gsathya@torproject.org> created a patch for the wizard
 which updated the icon and link for the secure chat app info to point
 to Gibberbot, and hopefully will continue to contribute useful patches.
 __sporkbomb <manuel@acanthephyra.net> implemented an updated set of logic
 in TorTransProxy for handling the "transproxy all" mode of operation. Before
 certain system processes were leaking traffic, and this was also detected
 by his excellent auditing.
 Amogh Pradeep <amoghbl1@gmail.com> submitted a patch to address an issue
 with the ongoing data transfer notification dying now and then, and is
 working on improving the notification display in general
 We found a nice new power button vector set here under the CC license:
 http://vector4free.com/vector/free-vector-power-buttons/
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@ -1,58 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="org.torproject.android" android:versionName="1.0.5" android:versionCode="11">
       <uses-permission android:name="android.permission.INTERNET" />
       <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
        <activity android:name=".Orbot"
                  android:theme="@android:style/Theme.NoTitleBar">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
          </intent-filter>
            <intent-filter>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
            <category android:name="android.intent.category.BROWSABLE" />
        </intent-filter>
         <intent-filter>
                <category android:name="android.intent.category.DEFAULT" />
            	<action android:name="org.torproject.android.REQUEST_HS_PORT" />
            </intent-filter>
             <intent-filter>
                <category android:name="android.intent.category.DEFAULT" />
            	<action android:name="org.torproject.android.START_TOR" />
            </intent-filter>
        </activity>
        <activity android:name=".SettingsPreferences"  android:label="@string/app_name"/>
        <activity android:name=".AppManager"  android:label="@string/app_name"/>
        <activity android:name=".WizardActivity"  android:label="@string/app_name"/>
    	<service android:name=".service.TorService" android:process=":remote">
 	            <intent-filter>
 	                <action android:name="org.torproject.android.service.ITorService" />
 	              	<action android:name="org.torproject.android.service.TOR_SERVICE" />
            </intent-filter>
    	</service>
    	<receiver android:name=".boot.OnbootBroadcastReceiver">
 			<intent-filter>
 			<action
 			android:name="android.intent.action.BOOT_COMPLETED" />
 			<category android:name="android.intent.category.HOME" />
 			</intent-filter>
 		</receiver>
    </application>
    <uses-sdk android:minSdkVersion="4"/>
 </manifest> 
--- a/AndroidManifest.xml.debug
+++ b/AndroidManifest.xml.debug
@ -1,60 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="org.torproject.android" android:versionName="1.0.4" android:versionCode="10">
       <uses-permission android:name="android.permission.INTERNET" />
    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
        <activity android:name=".Orbot"
                  android:theme="@android:style/Theme.NoTitleBar">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
          </intent-filter>
            <intent-filter>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
            <category android:name="android.intent.category.BROWSABLE" />
        </intent-filter>
         <intent-filter>
                <category android:name="android.intent.category.DEFAULT" />
            	<action android:name="org.torproject.android.REQUEST_HS_PORT" />
            </intent-filter>
             <intent-filter>
                <category android:name="android.intent.category.DEFAULT" />
            	<action android:name="org.torproject.android.START_TOR" />
            </intent-filter>
        </activity>
        <activity android:name=".SettingsPreferences"  android:label="@string/app_name"/>
        <activity android:name=".AppManager"  android:label="@string/app_name"/>
        <activity android:name=".WizardActivity"  android:label="@string/app_name"/>
    	<!-- <service android:name=".service.TorService" android:process=":remote"> -->
    	<service android:name=".service.TorService">
 	            <intent-filter>
 	                <action android:name="org.torproject.android.service.ITorService" />
 	              	<action android:name="org.torproject.android.service.TOR_SERVICE" />
            </intent-filter>
    	</service>
    	<!--
    	<receiver android:name=".OnBootReceiver">
 			<intent-filter>
 			<action
 			android:name="android.intent.action.BOOT_COMPLETED" />
 			<category android:name="android.intent.category.HOME" />
 			</intent-filter>
 		</receiver>
    	-->
    </application>
    <uses-sdk android:minSdkVersion="4"/>
 </manifest> 
--- a/AndroidManifest.xml.production
+++ b/AndroidManifest.xml.production
@ -1,51 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="org.torproject.android" android:versionName="0.2.2.14-orbot-alpha-1.0.3" android:versionCode="9">
       <uses-permission android:name="android.permission.INTERNET" />
    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
        <activity android:name=".Orbot"
                  android:theme="@android:style/Theme.NoTitleBar">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
          </intent-filter>
            <intent-filter>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
            <category android:name="android.intent.category.BROWSABLE" />
        </intent-filter>
         <intent-filter>
                <category android:name="android.intent.category.DEFAULT" />
            	<action android:name="org.torproject.android.REQUEST_HS_PORT" />
            </intent-filter>
             <intent-filter>
                <category android:name="android.intent.category.DEFAULT" />
            	<action android:name="org.torproject.android.START_TOR" />
            </intent-filter>
        </activity>
        <activity android:name=".SettingsPreferences"  android:label="@string/app_name"/>
        <activity android:name=".AppManager"  android:label="@string/app_name"/>
        <activity android:name=".WizardActivity"  android:label="@string/app_name"/>
    	<service android:name=".service.TorService" android:process=":remote">
 	            <intent-filter>
 	                <action android:name="org.torproject.android.service.ITorService" />
 	              	<action android:name="org.torproject.android.service.TOR_SERVICE" />
            </intent-filter>
    	</service>
    </application>
    <uses-sdk android:minSdkVersion="4"/>
 </manifest> 
--- a/168
+++ b/168
@ -1,159 +1,45 @@
-nThis document explains how to properly build an Android package of Orbot from
+
-source. It covers building on Debian Lenny (5.0.3).
+This document explains how to properly build an Android package of Orbot from
 source.
 Orbot includes, in the external directory, git repo submodules of:
 	- Tor
 	- OpenSSL (statically built and patched for Android)
 	- LibEvent
 	- JTorControl: The Tor Control Library for Java
 Please install the following prerequisites (instructions for each follows):
 	ant: http://ant.apache.org/
-	Android OS SDK: http://source.android.com/download
+	Android Native Dev Kit or NDK (for C/C++ code):
-	droid-wrapper: http://github.com/tmurakam/droid-wrapper
+        http://developer.android.com/sdk/ndk/index.html
-	libevent source (1.4.12-stable from svn)
+	Android Software Dev Kit or SDK (for Java code):
-	Tor source (most recent git master branch)
+        http://developer.android.com/sdk/index.html
-	Privoxy source (http://sourceforge.net/projects/ijbswa/)
+	AutoMake and AutoConf tool
 	sudo apt-get install autotools-dev
 	sudo apt-get install automake
 	sudo apt-get install autogen autoconf libtool gettext-base autopoint
-Install and prepare the Android OS SDK ( http://source.android.com/download )
+You will need to run the 'android' command in the SDK to install the necessary
-on Debian Lenny:
+Android platform supports (ICS 4.x or android-15)
-	sudo apt-get install git-core gnupg sun-java5-jdk flex bison gperf \
+Be sure that you have all of the git submodules up-to-date:
 		libsdl-dev libesd0-dev libwxgtk2.6-dev build-essential zip \
 		curl libncurses5-dev zlib1g-dev valgrind libtool automake \
 		ruby subversion
 	update-java-alternatives -s java-1.5.0-sun
-	curl http://android.git.kernel.org/repo >~/bin/repo
+	./tor-droid-make.sh fetch
 	chmod a+x ~/bin/repo
-	mkdir ~/mydroid
+To begin building, from the Orbot root directory, it builds all submodules and
-	cd ~/mydroid
+the project.
-	repo init -u git://android.git.kernel.org/platform/manifest.git
+        ./tor-droid-make.sh build
 	repo sync
-	# Paste in key from http://source.android.com/download next...
+Now build the Android app
 	gpg --import
-	cd ~/mydroid
+(gradle / android studio instructions here)
-	# This takes a long while...
+This will produce an unsigned Tor package APK.
 	make
 Install droid-wrapper:
 	cd /tmp
 	git clone git://github.com/tmurakam/droid-wrapper.git
 	cd droid-wrapper
 	sudo make install
 zlib and OpenSSL are included with the Android OS SDK. You'll need to build
 libevent, Privoxy and finally Tor. We'll create an externals directory for this code:
 	mkdir -p ~/mydroid/external/{libevent,tor,privoxy}
 We need to set to environment variables for droid-gcc:
 	export DROID_ROOT=~/mydroid/
 	export DROID_TARGET=generic
 Fetch and build Privoxy:
 	cd ~/mydroid/external/privoxy
 	wget http://sourceforge.net/projects/ijbswa/files/Sources/3.0.12%20%28stable%29/privoxy-3.0.12-stable-src.tar.gz/download
 	tar xzvf privoxy-3.0.12-stable-src.tar.gz
 	cd privoxy-3.0.12-stable
 	autoheader
 	autoconf
 	#need to disable setpgrp check in configure
 	export ac_cv_func_setpgrp_void=yes
 	#replace FOO with your actual username
 	CC=droid-gcc LD=droid-ld CPPFLAGS="-I/home/FOO/mydroid/external/zlib/" ./configure --host=arm-none-linux-gnueabi
 	#don't mind the "unrecognized option '-pthread'" error message that you'll see when you run make
 	make
 Fetch and build libevent:
 	cd ~/mydroid/external/libevent
 	svn co https://levent.svn.sourceforge.net/svnroot/levent/tags/release-1.4.12-stable/libevent/ .
 	export LIBEVENTDIR=`pwd`
 	./autogen.sh
 	# Put the contents of http://pastebin.ca/1577207 in /tmp/libevent-patch
 	patch < /tmp/libevent-patch
 	CC=droid-gcc LD=droid-ld ./configure --host=arm-none-linux-gnueabi
 	make
 Copy over the libevent library:
 	cp .libs/libevent.a ~/mydroid/out/target/product/generic/obj/lib
 Fetch and build Tor:
 	export OPENSSLDIR=`cd ~/mydroid/external/openssl/include/ && pwd`
 	export ZLIBDIR=`cd ~/mydroid/external/zlib && pwd`
 	cd ~/mydroid/external/tor
 	git clone git://git.torproject.org/git/tor.git
 	cd tor/
 	./autogen.sh
 	CC=droid-gcc LD=droid-ld ./configure --host=arm-none-linux-gnueabi \
 	--with-libevent-dir=$LIBEVENTDIR --with-openssl-dir=$OPENSSLDIR \
 	--with-zlib-dir=$ZLIBDIR --disable-asciidoc
 	make
 At this point, you'll have a Tor binary that can be run on an Android handset.
 This isn't enough though and we'll now sew up the binary into a small package
 that will handle basic Tor controlling features.
 We need to build our Java SOCKS library:
 	# If you're in Orbot's directory already...
 	cd ../asocks/
 	ant compile
 	ant jar
 	cp bin/jar/asocks.jar ../Orbot/libs
 We need to get the TorControl library for Java:
 (see also https://svn.torproject.org/svn/torctl/trunk/doc/howto.txt)
 	git clone git://git.torproject.org/git/jtorctl
 	cd jtorctl
 	mkdir bin
 	javac net/freehaven/tor/control/TorControlConnection.java -d bin
 	cd bin
 	jar cvf jtorctrl.jar *
 	cp jtorctrl.jar {Orbot Home}/libs
 Finally, we'll make a proper Android package with ant and the Android App SDK:
 	export APP_SDK=~/Documents/projects/android/android-sdk-linux_x86-1.5_r3/tools
 	cd ../Orbot/
 	cp ~/mydroid/external/privoxy/privoxy-3.0.12-stable/privoxy assets/privoxy
 	cp ~/mydroid/external/tor/tor/src/or/tor assets/tor
 	$APP_SDK/android update project --name Orbot --target 3 --path .
 	ant release
 This will produce an unsigned Tor package in ./bin/Orbot-unsigned.apk!
 To produce a usable package, you'll need to sign the .apk. The basics on
 signing can be found on the Android developer site:
 	http://developer.android.com/guide/publishing/app-signing.html
 The three steps are quite simple. First, you'll generate a key. Secondly,
 you'll sign the application. Thirdly, you'll verify the the apk.
 Generating a signing key:
 	keytool -genkey -v -keystore my-release-key.keystore \
 		-alias orbots_key -keyalg RSA -validity 10000
 Sign the apk:
 	jarsigner -verbose -keystore my-release-key.keystore \
 		bin/Orbot-unsigned.apk orbots_key
 Verify the signature for the apk:
 	jarsigner -verify bin/Orbot-unsigned.apk
 	mv bin/Orbot-unsigned.apk bin/Orbot-signed-alpha.apk
 You can also GPG sign the apk and generate an .asc:
 	gpg -ab Orbot-signed-alpha.apk
 Now you should have a fully signed and production ready alpha release of Orbot!
 Give bin/Orbot-signed-alpha.apk an install and send us bug reports!
--- a/98
+++ b/98
@ -1,98 +0,0 @@
 NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/
 1.0.5
 - Removed unused Socks client code from android.net package
 1.0.4
 - Added Russian, Persian, Arabic and other .po translations (see res/values-* folders)
 - Fixed incorrect try to clear iptables rules for non-root devices
 - Fixed bug that stopped wizard helper from showing first time
 - Added new green notification icon when Tor is connected
 - Fixed app selector layout in settings
 - Moved minSDK to 4 (Android 1.6); discontinued 1.5 support
 - Fixed log screen touch disable tor bug
 - Debugged issues around network status change causing FC/crash
 - Added "Start on Boot" option
 1.0.3
 - Fixed spanish language issues with settings screen
 - Cleaned up logging, and moved most of it to debug output only
 - Small changes to iptables, transproxy settings to handle iptables 1.3 and 1.4 variations
 - Added compile time variable/flag for turning on/off detailed control port output to Android stdout
 - Hidden services now support through option in settings
 - removed double apostrophes from value/strings.xml files
 1.0.2
 - Added "check" yes/no dialog prompt
 - Debugged iptables/transprox settings on Android 1.6 and 2.2
 - Added proxy settings help screen and fixed processSettings() NPE
 1.0.1
 - Found and fixed major bug in per-app trans proxying; list of apps was being cached and iptables rules were not properly updated as the user changed the selection in the list
 1.0.0 - 2010-08-10
 - Added "Proxy Settings" help screen
 - Handle potential null pointers on process settings where service not yet active 
 0.0.9x - 2010-08-03
 - Revised Orbot install wizard
 - Integrated Tor 0.2.2.14 and iptables 4.x binary
 - Fixed "got root" detection method 
 - Fixed Per App Torification handling so it updates on exit from Settings screen
 0.0.8x - 2010-07-15
 - Updated Settings & App configuration screens
 - Changed progress dialog display
 - Significant application re-arch
 - Fixed force stop crash on install
 - Integrated Tor 0.2.2.13-alpha-dev binary
 - Fixed su shell cmd error handling & root perms issue
 - #1570: Added new setup wizard on install to clarify root / non-root capabilities 
 - #1716: Per-app traffic routing prefs not persisted
 - #1509: Help window is too big for the screen on android 1.6
 - #1513: Orbot can't be told to exit <-- added 'Exit' menu option
 - #1530: Capture sh cmd stout for debugging errors <-- updated debug log screen
 - #1531: Don't loop ad infinitum in Orbot fails <-- only retries 3 times now
 - #1272: Orbot should store Tor files in the cache
 - #1273: Info should mention anonymity problems with ProxySurf
 0.0.5x
 - #1388: Error parsing PID from output of "ps"
 - #1277, #1278: Enabling bridges issues
 - #1279: Misleading message when initialization is finished
 - #1292: Tor version in About screen is wrong
 0.0.3x - 2010-03-15
 - Added Start/Stop menu item for non-touch activation
 - Improved parsing and validation of settings screen
 - UI now compatible with landscape mode (#1276)
 - Added relay support for static/publicly accessible IP devices
 0.0.3a - 2010-02-07
 - Integrated iptables support for transparent proxying of outbound port
  80 and DNS
 - Privoxy is now used as HTTP Proxy server (cross-compiled to ARM)
 - New UI layout and graphics
 - Android settings screen for generated torrc file
 - Improved performance and error handling
 0.0.2a - 2009-11-30
 - Update user interface layout and graphics
 - Modified service launch, shutdown and handling
 - Improved event handler on Tor Control port callbacks
 - Added Help page
 0.0.2 - 2009-11-27
 - Major improvement to the user interface including relative layout for
  different screens
 - New graphics resources
 - Implemented Tor Control Port using official Java library
 - Added 'clear' button to the log screen
 - Added 'save' and editable textbox for the settings screen
 - Moved screen navigation to a pop-up menu
 0.0.1-alpha - 2009-10-21
 - First code release
 - Major Features: Tor binary application is fully operational, UI:
  Start/Stop Tor, View Message Log, View Settings (torrc)
--- a/39
+++ b/39
@ -1,39 +0,0 @@
 Orbot: Android Onion Routing Robot
 ***********************************************
 Android is a freely licensed open-source application developed for the
 Android platform. It acts as a front-end to the Tor binary application,
 and also provides an HTTP Proxy for connecting web browsers and other
 HTTP client applications into the Tor SOCKS interface.
 *** PreReqs ***
 You need the Android Developer SDK to compile and build the APK file:
 http://developer.android.com/
 The project files including in this distribution are meant to be used
 with Eclipse: http://eclipse.org/
 *** How to use ***
 Currently, Orbot will work with any application that supports using
 an HTTP or SOCKS Proxy. Once you start Tor using Orbot, you can then
 point your application to HTTP port 8118 or SOCKS port 9050 on localhost
 IP 127.0.0.1.
 You can also set the Android system-wide HTTP proxy using the Mobile
 Network APN:
 Settings->Mobile networks->Access Point Names->(select your Carrier APN):
 Proxy: 127.0.0.1
 Port:8118
 ** A Few Notes **
 To ensure you are connected to the Tor network, you should browse to
 https://check.torproject.org/
 The first time you activate Orbot, it may take a while to connect to
 Tor. Check the message log to ensure you are "100% Bootstrapped".
 ***********************************************
 /* Copyright (c) 2009-2010, Nathan Freitas, The Guardian Project
 * http://guardianproject.info/ */
--- a/99
+++ b/99
@ -1,9 +1,10 @@
 This file contains the license for Orbot, a free software project to
 provide anonymity on the Internet from a Google Android smartphone.
-It also lists the licenses for other components used by Orbot.
+It also lists the licenses for other components used by Orbot, including 
 Tor, Privoxy, and iptables.
-For more information about Orbot, see http://guardianproject.info/
+For more information about Orbot, see https://guardianproject.info/apps/orbot
 If you got this file as a part of a larger bundle, there may be other
 license terms that you should be aware of.
@ -41,14 +42,55 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****
-Orbot contains a binary distribution of the JSocks library:
+
-http://code.google.com/p/jsocks-mirror/
+===============================================================================
-which is licensed under the GNU Lesser General Public License:
+Orbot includes the Obfs4 pluggable transport:
-http://www.gnu.org/licenses/lgpl.html
+https://gitweb.torproject.org/pluggable-transports/obfs4.git
 Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice,
   this list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 ===============================================================================
 *****
-Orbot contains the source code for HttpProxy developed and freely licensed
+
-by: Julian Robichaux -- http://www.nsftools.com
+*****
 Orbot contains a binary distribution of Privoxy (http://www.privoxy.org/)
 Copyright © 2001-2010 by Privoxy Developers <ijbswa-developers@lists.sourceforge.net>
 http://www.privoxy.org/user-manual/copyright.html
 Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. 
 and licensed under the GNU General Public License.
 Privoxy is free software; you can redistribute it and/or modify it under the terms of the 
 GNU General Public License, version 2, as published by the Free Software Foundation.
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
 without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
 See the GNU General Public License for details.
 http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 ******
 Orbot contains a binary distribution of Tor:
@ -63,7 +105,6 @@ Orbot contains a binary distribution of Tor:
             If you got this file as a part of a larger bundle,
        there may be other license terms that you should be aware of.
 ===============================================================================
 Tor is distributed under this license:
@ -141,3 +182,43 @@ http://ip-to-country.webhosting.info."
 See the src/config/geoip file in particular.
 ===============================================================================
 ===============================================================================
 Orbot also uses iptables from the Netfilter.org project
 netfilter/iptables is - like all of the Linux Kernel - Free Software (sometimes
 referred to as Open Source Software), distributed under the terms of the GNU GPLv2
 only. Please, note that some source code files might differ, and in that case it
 is explicitely stated in the header of every file.
 The GPL also contains some obligations. If you distribute netfilter/iptables code
 in binary form, you have to offer the source code, too.
 ===============================================================================
 ===============================================================================
 Orbot also includes BadVPN tun2socks: https://github.com/ambrop72/badvpn
 Copyright (c) 2009, Ambroz Bizjak <ambrop7@gmail.com>
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright
      notice, this list of conditions and the following disclaimer in the
      documentation and/or other materials provided with the distribution.
    * Neither the name of the author nor the
      names of its contributors may be used to endorse or promote products
      derived from this software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ===============================================================================
--- a/33
+++ b/33
@ -1,15 +1,28 @@
-Orbot: Android Onion Routing Robot
+Tor Android
 ***********************************************
-Orbot is a freely licensed open-source application developed for the
+This is a project forked from Orbot for building the tor binary for Android
 Android platform. It acts as a front-end to the Tor binary application,
 and also provides an HTTP Proxy for connecting web browsers and other
 HTTP client applications into the Tor SOCKS interface.
 How to Build
 ***********************************************
-Orbot is a component of the Guardian Project, an effort to develop
+Please see: https://raw.githubusercontent.com/n8fr8/tor-android/master/BUILD
-a secure, anonymous smartphone for use by human rights activists, journalists
+
-and others around the world. Learn more: http://guardianproject.info/
+How to Use via Gradle
 ***********************************************
 Add the repository your list as shown:
 repositories {
        maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
    }
 and then add the dependency, setting it to the latest version (or any version) we have made available, as a release:
 dependencies {
    compile 'org.torproject:tor-android-binary:0.3.1.9'
 }
 ***********************************************
 Tor protects your privacy on the internet by hiding the connection
@ -21,7 +34,3 @@ Tor Frequently Asked Questions:
        https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ
        https://www.torproject.org/faq.html.en
 ***********************************************
 /* Copyright (c) 2009-2010, Nathan Freitas, The Guardian Project
 * http://guardianproject.info/ */
--- a/16
+++ b/16
@ -1,14 +1,8 @@
-See http://bugs.noreply.org/flyspray/index.php?tasks=all&project=8
+Current tracked tickets for Orbot can be found here:
-for the latest active bug and enhancment tickets.
+https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=new&status=reopened&group=component&component=Orbot&order=priority
-In addition, here are some other big areas that need work:
+If you would like to join the project, we have some ideas for volunteering here:
-
+http://www.torproject.org/getinvolved/volunteer.html.en#project-orbot
 - Android Java UI work: Improved home screen to show better statistics about data transferred (up/down), number of circuits connected, quality of connection and so on. The "Tether Wifi" Android application is a good model to follow in how it shows a realtime count of bytes transferred as well as notifications when wifi client connect. In addition, better display/handling of Tor system/error messages would also be very helpful. Finally, the addition of a wizard or tutorial walkthrough for novice users to explain to them exactly what or what is not anonymized or protected would greatly improve the likelihood they will use Orbot correctly.
 - Android Java OS/Core app work: Better system-wide indicator either via the notification bar, "Toast" pop-up dialogs or some other indicator that an application's traffic is indeed moving through Orbot/Tor. For instance, right now you need to first go to a torcheck web service to ensure your browser is routing via Tor. Orbot should be able to notify you that circuits are being opened, used, etc. The aforementioned data transfer tracker might provide this type of awareness as well.
 - Android Java Library/Community Outreach work: We need to package a simple library for use with third-party application to easily enable them to support "Torification" on non-root devices (aka w/o transparent proxying). This library should include a wrapper for the Apache HTTPClient library, a utility class for detecting the state of Orbot connectivity, and other relevant/useful things an Android app might need to anonymize itself. This work would include the creation of the library, documentation, and sample code. Outreach or effort to implement the library within other open-source apps would follow.
 -  Android OS/C/Linux work: The port of Tor to Android is basically a straight cross-compile to Linux ARM. There has been no work done in looking the optimization of Tor within a mobile hardware environment, on the ARM processor or other Android hardware, or on mobile networks. It should be noted, that even without optimization, Tor is handling the mobile network environment very well, automatically detecting change in IP addresses, reconnecting circuits, etc across switching from 2G to 3G to Wifi, and so forth. 
 You can find us in IRC on FREENODE or OFTC in the #guardianproject and #tor-dev channels
--- a/assets/privoxy.config
+++ b/assets/privoxy.config
@ -1,27 +0,0 @@
 # Generally, this file goes in /etc/privoxy/config
 #
 # Tor listens as a SOCKS4a proxy here:
 forward-socks4a / 127.0.0.1:9050 .
 confdir /data/data/org.torproject.android
 logdir /data/data/org.torproject.android
 # actionsfile standard  # Internal purpose, recommended
 #actionsfile default.action   # Main actions file
 #actionsfile user.action      # User customizations
 #filterfile default.filter
 # Don't log interesting things, only startup messages, warnings and errors
 #logfile logfile
 #jarfile jarfile
 #debug 1
 #debug   0    # show each GET/POST/CONNECT request
 #debug   4096 # Startup banner and warnings
 #debug   8192 # Errors - *we highly recommended enabling this*
 #user-manual /usr/share/doc/privoxy/user-manual
 listen-address  127.0.0.1:8118
 toggle  1
 accept-intercepted-requests 1 
 enable-remote-toggle 0
 enable-edit-actions 0
 enable-remote-http-toggle 0
 buffer-limit 4096
--- a/assets/torrc
+++ b/assets/torrc
@ -1,13 +0,0 @@
 SocksPort 9050
 TestSocks 1
 WarnUnsafeSocks 1
 Log notice stdout
 DataDirectory /data/data/org.torproject.android/data
 ControlPort 9051
 CookieAuthentication 1
 RelayBandwidthRate 20 KBytes
 RelayBandwidthBurst 20 KBytes
 UseBridges 0
 AutomapHostsOnResolve 1
 TransPort 9040
 DNSPort 5400
--- a/bcdroid.manifest
+++ b/bcdroid.manifest
@ -1,3 +0,0 @@
 Manifest-Version: 1.0
 Sealed: true
--- a/build.gradle
+++ b/build.gradle
@ -0,0 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
    repositories {
        google()
        jcenter()
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:3.2.0'
    }
 }
 allprojects {
    repositories {
        google()
        jcenter()
    }
 }
--- a/build.xml
+++ b/build.xml
@ -1,67 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Orbot">
    <!-- The local.properties file is created and updated by the 'android' tool.
         It contains the path to the SDK. It should *NOT* be checked in in Version
         Control Systems. -->
    <property file="local.properties" />
    <!-- The build.properties file can be created by you and is never touched
         by the 'android' tool. This is the place to change some of the default property values
         used by the Ant rules.
         Here are some properties you may want to change/update:
         application.package
             the name of your application package as defined in the manifest. Used by the
             'uninstall' rule.
         source.dir
             the name of the source directory. Default is 'src'.
         out.dir
             the name of the output directory. Default is 'bin'.
         Properties related to the SDK location or the project target should be updated
          using the 'android' tool with the 'update' action.
         This file is an integral part of the build system for your application and
         should be checked in in Version Control Systems.
         -->
    <property file="build.properties" />
    <!-- The default.properties file is created and updated by the 'android' tool, as well
         as ADT.
         This file is an integral part of the build system for your application and
         should be checked in in Version Control Systems. -->
    <property file="default.properties" />
    <!-- Custom Android task to deal with the project target, and import the proper rules.
         This requires ant 1.6.0 or above. -->
    <path id="android.antlibs">
        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
    </path>
    <taskdef name="setup"
        classname="com.android.ant.SetupTask"
        classpathref="android.antlibs" />
    <!-- Execute the Android Setup task that will setup some properties specific to the target,
         and import the build rules files.
         The rules file is imported from
            <SDK>/platforms/<target_platform>/templates/android_rules.xml
         To customize some build steps for your project:
         - copy the content of the main node <project> from android_rules.xml
         - paste it in this build.xml below the <setup /> task.
         - disable the import by changing the setup task below to <setup import="false" />
         This will ensure that the properties are setup correctly but that your customized
         build steps are used.
    -->
    <setup />
 </project>
--- a/external/Makefile
+++ b/external/Makefile
@ -0,0 +1,314 @@
 # Please install the following prerequisites (instructions for each follows):
 # 	Android OS SDK: http://source.android.com/download
 #
 # Install and prepare the Android OS SDK ( http://source.android.com/download )
 # on Debian or Ubuntu
 ### these modify the calling shell
 # workaround for cross-compiling bug in autoconf
 export ac_cv_func_malloc_0_nonnull=yes
 export ac_cv_func_setpgrp_void=yes
 EXTERNAL_ROOT := $(shell pwd)
 DEBUG ?= 0
 # No-op command.
 NOOP = true
 # Android now has 64-bit and 32-bit versions of the NDK for GNU/Linux.  We
 # assume that the build platform uses the appropriate version, otherwise the
 # user building this will have to manually set NDK_PROCESSOR or NDK_TOOLCHAIN.
 CPU := $(shell uname -m)
 ifeq ($(CPU),x86_64)
 NDK_PROCESSOR=x86_64
 else
 NDK_PROCESSOR=x86
 endif
 # Android NDK setup
 ANDROID_NDK_HOME ?= /opt/android-ndk
 ANDROID_NDK ?= $(ANDROID_NDK_HOME)
 NDK_PLATFORM_LEVEL ?= 16
 NDK_TOOLCHAIN_VERSION=4.9
 APP_ABI ?= armeabi
 NDK_ABI ?= $(APP_ABI)
 # PIEFLAGS for SDK 16/Android L must be set to -fPIE -pie, but can override for earlier targets 
 PIEFLAGS ?= -fPIE -pie
 ifneq ($(filter arm%, $(APP_ABI)),)
  NDK_ABI := arm
 endif
 ifneq ($(filter arm64%, $(APP_ABI)),)
 NDK_ABI := arm64
 endif
 NDK_SYSROOT=$(ANDROID_NDK_HOME)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI)
 NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]')
 ifneq ($(filter mips%, $(NDK_ABI)),)
 HOST := $(NDK_ABI)el-linux-android
 endif
 ifneq ($(filter arm64, $(NDK_ABI)),)
 HOST := aarch64-linux-android
 endif
 ifneq ($(filter arm, $(NDK_ABI)),)
 HOST := arm-linux-androideabi
 endif
 ifneq ($(filter x86, $(NDK_ABI)),)
 HOST := i686-linux-android
 endif
 ifneq ($(filter x86_64, $(NDK_ABI)),)
 HOST := x86_64-linux-android
 endif
 NDK_TOOLCHAIN := $(HOST)-$(NDK_TOOLCHAIN_VERSION)
 ifneq ($(filter x86%, $(NDK_ABI)),)
 NDK_TOOLCHAIN := $(NDK_ABI)-$(NDK_TOOLCHAIN_VERSION)
 endif
 NDK_TOOLCHAIN_BASE=$(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR)
 # include Android's build flags
 TARGET_ARCH_ABI = $(APP_ABI)
 #include $(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/setup.mk
 CC := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-gcc --sysroot=$(NDK_SYSROOT)
 CXX := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-g++ --sysroot=$(NDK_SYSROOT)
 CPP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-cpp --sysroot=$(NDK_SYSROOT)
 LD := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ld
 AR := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ar
 RANLIB := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ranlib
 ifeq ($(DEBUG), 1)
 	STRIP := $(NOOP)
 else
 	STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-unneeded -R .note -R .comment --strip-debug
 endif
 CFLAGS = -DANDROID $(TARGET_CFLAGS) $(PIEFLAGS)
 LDFLAGS = -llog $(TARGET_LDFLAGS) $(PIEFLAGS)
 # change 'release' to 'debug' for unoptimized debug builds
 ifeq ($(APP_ABI),armeabi-v7a)
 	CFLAGS += $(TARGET_arm_release_CFLAGS)
 endif
 ifeq ($(APP_ABI),armeabi)
 	CFLAGS += $(TARGET_thumb_release_CFLAGS)
 endif
 .PHONY = clean showsetup \
 	assets assets-clean \
 	openssl-static openssl-static-clean \
 	libevent libevent-clean \
 	lzma lzma-clean \
 	zstd zstd-clean \
 	tor tor-clean
 all: assets
 #------------------------------------------------------------------------------#
 # openssl
 # Disable rc4 cipher for 64-bit archs, to avoid this link error for tor:
 # external/lib/libcrypto.a(e_rc4_hmac_md5.o):e_rc4_hmac_md5.c:function rc4_hmac_md5_cipher: error: undefined reference to 'rc4_md5_enc'
 OPENSSL_CONF_FLAG=
 ifneq ($(findstring 64, $(NDK_ABI)),)
 OPENSSL_CONF_FLAG+=no-rc4
 endif
 # OpenSSL's 'make depend' fails if _MIPS_SZLONG is not set:
 ifneq ($(filter mips%, $(NDK_ABI)),)
 ifneq ($(findstring 64, $(NDK_ABI)),)
  OPENSSL_CONF_FLAG+=-D_MIPS_SZLONG=64
 else
  OPENSSL_CONF_FLAG+=-D_MIPS_SZLONG=32 -D__MIPSEL__
 endif
 endif
 lib/libcrypto.a:
 	cd openssl && \
 		./Configure android -D__ANDROID_API__=$(NDK_PLATFORM_LEVEL) -DL_ENDIAN $(OPENSSL_CONF_FLAG) && \
 		make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr depend && \
 		make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs
 lib/libssl.a:
 	cp config.sub openssl
 	cp config.guess openssl
 	cd openssl && \
 		./Configure android -D__ANDROID_API__=$(NDK_PLATFORM_LEVEL) -DL_ENDIAN $(OPENSSL_CONF_FLAG) && \
 		make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr depend && \
 		make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs
 openssl-build-stamp: lib/libcrypto.a lib/libssl.a
 	touch openssl-build-stamp
 openssl: openssl-build-stamp
 	test -d lib || mkdir lib
 	test -d include || mkdir include
 	test -d include/openssl || mkdir include/openssl
 	cp openssl/libcrypto.a lib/libcrypto.a
 	cp openssl/libssl.a lib/libssl.a
 	cp openssl/include/openssl/* include/openssl
 openssl-clean:
 	-rm openssl-build-stamp
 	-rm lib/libcrypto.a
 	-rm lib/libssl.a
 	-cd openssl && \
 		git clean -fdx
 #------------------------------------------------------------------------------#
 # libevent
 libevent/Makefile:
 	sed -i 's@\(SUBDIRS = . include\) sample test@\1@' libevent/Makefile.am
 	cp libevent-patch-1 libevent
 	-cd libevent && \
 	 	patch -N -p1 --reject-file=- < libevent-patch-1
 	##sed -i 's@\(AC_OUTPUT(Makefile include/Makefile\) test/Makefile sample/Makefile)@\1)@' libevent/configure.in
 	cd libevent && ./autogen.sh
 	cp config.sub libevent
 	cp config.guess libevent
 	cd libevent && \
 		CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \
 			./configure \
 				--host=$(HOST) \
 				--disable-shared
 libevent-build-stamp: libevent/Makefile
 	$(MAKE) -C libevent ./include/event2/event-config.h all-am
 	touch libevent-build-stamp
 libevent: openssl libevent-build-stamp
 	test -d lib || mkdir lib
 	test -d include || mkdir include
 	cp libevent/.libs/libevent.a lib
 	cp -R libevent/include/event2 include
 libevent-clean:
 	-rm -f include/event2
 	-rm -f lib/libevent.a
 	-rm -f libevent-build-stamp
 	-cd libevent && \
 		git clean -fdx
 #------------------------------------------------------------------------------#
 # lzma
 xz/Makefile:
 	cd xz && ./autogen.sh
 	cp config.sub xz
 	cp config.guess xz
 	cd xz && \
 		 CC="$(CC)" CXX="$(CXX)" PKG_CONFIG_PATH="$(EXTERNAL_ROOT)/lib/pkgconfig" AR="$(AR)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS) -std=c99" LDFLAGS="$(LDFLAGS)"  \
 		./configure  --host=$(HOST) --disable-shared --enable-static --disable-doc --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --prefix=$(EXTERNAL_ROOT)
 lzma: lzma-build-stamp
 	$(MAKE) -C xz install
 lzma-build-stamp: xz/Makefile
 	touch lzma-build-stamp
 lzma-clean:
 	-rm -rf include/lzma
 	-rm -f include/lzma.h
 	-rm -f lib/liblzma.a
 	-rm -f lib/liblzma.la
 	-rm -f lzma-build-stamp
 	-cd xz && \
 		git clean -fdx
 #------------------------------------------------------------------------------#
 # zstd
 zstd: zstd-build-stamp
 	$(MAKE) -C zstd/lib CC="$(CC)" CXX="$(CXX)" AR="$(AR)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS)"  LDFLAGS="$(LDFLAGS)" PREFIX="$(EXTERNAL_ROOT)" libzstd.a-mt 
 	$(MAKE) -C zstd/lib CC="$(CC)" CXX="$(CXX)" AR="$(AR)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS)"  LDFLAGS="$(LDFLAGS)" PREFIX="$(EXTERNAL_ROOT)" libzstd.pc 
 	test -d lib || mkdir lib
 	test -d lib/pkgconfig || mkdir lib/pkgconfig
 	test -d include || mkdir include
 	cp zstd/lib/libzstd.a lib
 	cp zstd/lib/libzstd.pc lib/pkgconfig
 	cp zstd/lib/zstd.h include
 	cp zstd/lib/common/zstd_errors.h include
 	cp zstd/lib/deprecated/zbuff.h include
 	cp zstd/lib/dictBuilder/zdict.h include
 zstd-build-stamp:
 	touch zstd-build-stamp
 zstd-clean:
 	-rm -f include/zstd.h include/zstd_errors.h include/zbuff.h include/zdict.h
 	-rm -f lib/libzstd.a
 	-rm -f lib/pkgconfig/libzstd.pc
 	-rm -f zstd-build-stamp
 	-cd zstd && \
 		git clean -fdx
 #------------------------------------------------------------------------------#
 # tor
 tor/configure: 
 	cd tor && \
 	 ./autogen.sh
 tor/Makefile: tor/configure
 	cp config.sub tor
 	cp config.guess tor
 	cd tor && \
                CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) PKG_CONFIG_PATH="$(EXTERNAL_ROOT)/lib/pkgconfig" CFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \
                        LIBS="-L$(EXTERNAL_ROOT)/lib" CFLAGS="-I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2" \
                        ./configure \
                                --host=$(HOST) \
 				--disable-asciidoc \
 				--enable-static-libevent --with-libevent-dir=$(EXTERNAL_ROOT) \
 				--enable-static-openssl --with-openssl-dir=$(EXTERNAL_ROOT) \
 				--disable-linker-hardening --disable-gcc-hardening --disable-tool-name-check --disable-systemd --disable-module-dirauth
 tor-build-stamp: tor/Makefile
 	$(MAKE) -C tor all-am
 	touch tor-build-stamp
 tor: lzma zstd libevent openssl tor-build-stamp
 	test -d bin || mkdir bin
 	cp tor/src/or/tor bin
 tor-clean:
 	-rm -f bin/tor
 	-rm -f tor-build-stamp
 	-cd tor && \
 		git clean -fdx
 	-cd tor && \
 		git reset HEAD --hard
 #------------------------------------------------------------------------------#
 #create and clean assets: FYI - tor is stored as a ZIP file with an so extension
 #in the libs directly, so it is handled like a shared library for local installation
 assets: tor
 	install -d ../tor-android-binary/src/main/libs/$(APP_ABI)
 	-$(STRIP) bin/tor
 	-zip ../tor-android-binary/src/main/libs/$(APP_ABI)/tor.so bin/tor
 assets-clean:
 	-rm ../tor-android-binary/src/main/libs/$(APP_ABI)/tor.so
 #------------------------------------------------------------------------------#
 # cleanup, cleanup, put the toys away
 ##clean: openssl-clean libevent-clean tor-clean polipo-clean assets-clean
 clean: openssl-clean libevent-clean lzma-clean zstd-clean tor-clean
 #------------------------------------------------------------------------------#
 # debugging stuff
 showsetup:
 	@echo "NDK_TOOLCHAIN_VERSION: $(NDK_TOOLCHAIN_VERSION)"
 	@echo "NDK_TOOLCHAIN: $(NDK_TOOLCHAIN)"
 	@echo "NDK_PLATFORM_LEVEL: $(NDK_PLATFORM_LEVEL)"
 	@echo "NDK_SYSROOT: $(NDK_SYSROOT)"
 	@echo "APP_ABI: $(APP_ABI)"
 	@echo "HOST: $(HOST)"
 	@echo "CC: $(CC)"
 	@echo "LD: $(LD)"
 	@echo "CFLAGS: $(CFLAGS)"
 	@echo "LDFLAGS: $(LDFLAGS)"
--- a/external/config.guess
+++ b/external/config.guess
--- a/external/config.sub
+++ b/external/config.sub
--- a/external/libevent
+++ b/external/libevent
@ -0,0 +1 @@
 Subproject commit 90ae4c5013032158bafad41279823d90eec4d206
--- a/external/libevent-patch-1
+++ b/external/libevent-patch-1
@ -0,0 +1,29 @@
 For some reason arc4random_addrandom isn't present in 64-bit android archs. !
 diff --git a/configure.ac b/configure.ac
 index d42edd8..c511be7 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -290,7 +290,7 @@ AC_HEADER_TIME
 dnl Checks for library functions.
 AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep])
 -AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
 +AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf arc4random_addrandom issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
 AC_CHECK_FUNCS([umask])
 AC_CACHE_CHECK(
 diff --git a/evutil_rand.c b/evutil_rand.c
 index 284341c..97161e4 100644
 --- a/evutil_rand.c
 +++ b/evutil_rand.c
@@ -174,7 +174,9 @@ evutil_secure_rng_get_bytes(void *buf, size_t n)
 void
 evutil_secure_rng_add_bytes(const char *buf, size_t n)
 {
 +#ifdef _EVENT_HAVE_ARC4RANDOM_ADDRANDOM
 	arc4random_addrandom((unsigned char*)buf,
 	    n>(size_t)INT_MAX ? INT_MAX : (int)n);
 +#endif
 }
--- a/external/openssl
+++ b/external/openssl
@ -0,0 +1 @@
 Subproject commit e71ebf275da66dfd601c92e0e80a35114c32f6f8
--- a/external/tor
+++ b/external/tor
@ -0,0 +1 @@
 Subproject commit da95b91355248ad8f3a6aa6733cc6d24915f59ce
--- a/external/xz
+++ b/external/xz
@ -0,0 +1 @@
 Subproject commit 3d566cd519017eee1a400e7961ff14058dfaf33c
--- a/external/zstd
+++ b/external/zstd
@ -0,0 +1 @@
 Subproject commit f4340f46b2387bc8de7d5320c0b83bb1499933ad
--- a/gradle.properties
+++ b/gradle.properties
@ -0,0 +1,17 @@
 ## Project-wide Gradle settings.
 #
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 #
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 #
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Mon Jun 20 21:44:59 EDT 2016
 org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 android.useDeprecatedNdk=true
 aar.deployPath=/media/n8fr8/nate128/dev/repos/gpmaven
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,6 @@
 #Thu Oct 11 16:49:15 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
--- a/172
+++ b/172
@ -0,0 +1,172 @@
 #!/usr/bin/env sh
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
 # Need this for relative symlinks.
 while [ -h "$PRG" ] ; do
    ls=`ls -ld "$PRG"`
    link=`expr "$ls" : '.*-> \(.*\)$'`
    if expr "$link" : '/.*' > /dev/null; then
        PRG="$link"
    else
        PRG=`dirname "$PRG"`"/$link"
    fi
 done
 SAVED="`pwd`"
 cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 warn () {
    echo "$*"
 }
 die () {
    echo
    echo "$*"
    echo
    exit 1
 }
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
 case "`uname`" in
  CYGWIN* )
    cygwin=true
    ;;
  Darwin* )
    darwin=true
    ;;
  MINGW* )
    msys=true
    ;;
  NONSTOP* )
    nonstop=true
    ;;
 esac
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
    JAVACMD="java"
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
 # Increase the maximum file descriptors if we can.
 if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
            MAX_FD="$MAX_FD_LIMIT"
        fi
        ulimit -n $MAX_FD
        if [ $? -ne 0 ] ; then
            warn "Could not set maximum file descriptor limit: $MAX_FD"
        fi
    else
        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
    fi
 fi
 # For Darwin, add options to specify how the application appears in the dock
 if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
    JAVACMD=`cygpath --unix "$JAVACMD"`
    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
    SEP=""
    for dir in $ROOTDIRSRAW ; do
        ROOTDIRS="$ROOTDIRS$SEP$dir"
        SEP="|"
    done
    OURCYGPATTERN="(^($ROOTDIRS))"
    # Add a user-defined pattern to the cygpath arguments
    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
    fi
    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    i=0
    for arg in "$@" ; do
        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
        else
            eval `echo args$i`="\"$arg\""
        fi
        i=$((i+1))
    done
    case $i in
        (0) set -- ;;
        (1) set -- "$args0" ;;
        (2) set -- "$args0" "$args1" ;;
        (3) set -- "$args0" "$args1" "$args2" ;;
        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi
 # Escape application args
 save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
 APP_ARGS=$(save "$@")
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
 if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
  cd "$(dirname "$0")"
 fi
 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@ -0,0 +1,84 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS=
@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if "%ERRORLEVEL%" == "0" goto init
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation.
 goto fail
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 if exist "%JAVA_EXE%" goto init
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation.
 goto fail
 :init
@rem Get command-line arguments, handling Windows variants
 if not "%OS%" == "Windows_NT" goto win9xME_args
 :win9xME_args
@rem Slurp the command line arguments.
 set CMD_LINE_ARGS=
 set _SKIP=2
 :win9xME_args_slurp
 if "x%~1" == "x" goto execute
 set CMD_LINE_ARGS=%*
 :execute
@rem Setup the command line
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 :end
@rem End local scope for the variables with windows NT shell
 if "%ERRORLEVEL%"=="0" goto mainEnd
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
 if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
 exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 :omega
--- a/po2xml.sh
+++ b/po2xml.sh
@ -1,72 +0,0 @@
 #!/bin/bash
 #
 # Author: Runa A. Sandvik, <runa.sandvik@gmail.com>
 # For The Tor Project, Inc.
 #
 # This is Free Software (GPLv3)
 # http://www.gnu.org/licenses/gpl-3.0.txt
 #
 # This script will convert translated po files back to xml. Before
 # running the script, checkout the translation directory from
 # https://svn.torproject.org.
 #	
 ### Start config ###
 # Location of the translated files, i.e. the path to the orbot
 # directory in the translation module. Do not add the trailing slash. 
 translated=""
 # Location of the orbot directory, i.e. the original English xml file.
 # In svn, this should be svn/projects/android/trunk/Orbot/res. Do not add the
 # trailing slash.
 xml=""
 ### End config ###
 # Find po files to convert.
 po=`find $translated -type f -name \*.po`
 # For every po found, create and/or update the translated manpage.
 for file in $po ; do
 	# Get the basename of the file we are dealing with.
 	pofile=`basename $file`
 	# Strip the file for its original extension and add .xml.
 	xmlfile="${pofile%.*}.xml"
 	# Figure out which language we are dealing with.
 	lang=`dirname $file | sed "s#$translated/##"`
 	# The translated document is written if 80% or more of the po
 	# file has been translated. Also, po4a-translate will only write
 	# the translated document if 80% or more has been translated.
 	# However, it will delete the translated txt if less than 80%
 	# has been translated. To avoid having our current, translated
 	# xml files deleted, convert the po to a temp xml first. If this
 	# file was actually written, rename it to xml.
 	# Convert translated po to xml.
 	function convert {
 		po4a-translate -f xml -m "$xml/values/$xmlfile" -p "$file"  -l "$xml/values-$lang/tmp-$xmlfile" --master-charset utf-8 -L utf-8
 		# Check to see if the file was written. If yes, rename it.
 		if [ -e "$xml/values-$lang/tmp-$xmlfile" ]
 		then
 			mv "$xml/values-$lang/tmp-$xmlfile" "$xml/values-$lang/$xmlfile"
 			# We need to escape apostrophe's
 			sed -i "s/\([^\\]\)'/\1\\\\'/g" "$xml/values-$lang/$xmlfile" 
 		fi
 	}
 	# If the current directory is zh_CN use zh, else convert everything.
 	if [ $lang = "zh_CN" ]
 	then
 		lang="zh"
 		convert
 	else
 		convert
 	fi
 done
--- a/project.properties
+++ b/project.properties
@ -4,11 +4,10 @@
 # This file must be checked in Version Control Systems.
 #
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-8
+target=android-16
-apk-configurations=
+aar.deployPath=/media/n8fr8/nate128/dev/repos/gpmaven/
--- a/res/drawable/background.jpg
+++ b/res/drawable/background.jpg
--- a/res/drawable/bak/tornotification.png
+++ b/res/drawable/bak/tornotification.png
--- a/res/drawable/bak/tornotificationoff.png
+++ b/res/drawable/bak/tornotificationoff.png
--- a/res/drawable/bak/toroff.png
+++ b/res/drawable/bak/toroff.png
--- a/res/drawable/bak/toron.png
+++ b/res/drawable/bak/toron.png
--- a/res/drawable/bak/torstarting.png
+++ b/res/drawable/bak/torstarting.png
--- a/res/drawable/bak/torstopping.png
+++ b/res/drawable/bak/torstopping.png
--- a/res/drawable/bgtitanium.jpg
+++ b/res/drawable/bgtitanium.jpg
--- a/res/drawable/ic_menu_about.png
+++ b/res/drawable/ic_menu_about.png
--- a/res/drawable/ic_menu_check.png
+++ b/res/drawable/ic_menu_check.png
--- a/res/drawable/ic_menu_exit.png
+++ b/res/drawable/ic_menu_exit.png
--- a/res/drawable/ic_menu_goto.png
+++ b/res/drawable/ic_menu_goto.png
--- a/res/drawable/ic_menu_home.png
+++ b/res/drawable/ic_menu_home.png
--- a/res/drawable/ic_menu_register.png
+++ b/res/drawable/ic_menu_register.png
--- a/res/drawable/ic_menu_reports.png
+++ b/res/drawable/ic_menu_reports.png
--- a/res/drawable/icon.png
+++ b/res/drawable/icon.png
--- a/res/drawable/icon_orweb.png
+++ b/res/drawable/icon_orweb.png
--- a/res/drawable/icon_otrchat.png
+++ b/res/drawable/icon_otrchat.png
--- a/res/drawable/tor.png
+++ b/res/drawable/tor.png
--- a/res/drawable/tor128.png
+++ b/res/drawable/tor128.png
--- a/res/drawable/tor25.png
+++ b/res/drawable/tor25.png
--- a/res/drawable/tornotification.png
+++ b/res/drawable/tornotification.png
--- a/res/drawable/tornotificationgimpsrc.xcf
+++ b/res/drawable/tornotificationgimpsrc.xcf
--- a/res/drawable/tornotificationoff.png
+++ b/res/drawable/tornotificationoff.png
--- a/res/drawable/tornotificationon.png
+++ b/res/drawable/tornotificationon.png
--- a/res/drawable/toroff.png
+++ b/res/drawable/toroff.png
--- a/res/drawable/toron.png
+++ b/res/drawable/toron.png
--- a/res/drawable/torstarting.png
+++ b/res/drawable/torstarting.png
--- a/res/drawable/torstopping.png
+++ b/res/drawable/torstopping.png
--- a/res/drawable/vidalia.png
+++ b/res/drawable/vidalia.png
--- a/res/layout-land/layout_main.xml
+++ b/res/layout-land/layout_main.xml
@ -1,76 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:background="@drawable/bgtitanium">
    	<RelativeLayout android:id="@+id/layoutHeaderMain"
 		android:layout_width="fill_parent"
 		android:layout_height="30dp"
 		android:layout_gravity="center_horizontal"
 		android:background="#A0909090">
        <ImageView android:id="@+id/radioModeImage"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
 			android:layout_marginTop="3px"
 			android:layout_marginRight="3px"
 			android:gravity="right"
 			android:layout_toRightOf="@+id/radioModeLabel"
 			android:layout_alignParentRight="true"
 			android:layout_alignParentTop="true"
 			android:src="@drawable/tor25"
 			/>
 		<TextView android:id="@+id/radioModeText"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"           
            android:text="powered by The Tor Project  "
 			android:layout_marginTop="8px"
 			android:layout_marginRight="0px"
 			android:gravity="right"
 			android:layout_toLeftOf="@+id/radioModeImage"
            android:textColor="#cccccc" />
 	</RelativeLayout>
   <ScrollView android:id="@+id/mainview" 
 		android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">
   		<TableLayout android:id="@+id/mainLayout"
 			android:layout_gravity="center"
 			android:layout_height="wrap_content" 
 			android:layout_width="wrap_content">
 			<TableRow android:id="@+id/startRow">
 				<TableLayout
 					android:layout_gravity="center"
 					android:layout_height="wrap_content" 
 					android:layout_width="wrap_content">
 					<TableRow>
 							<ImageView
 							android:id="@+id/imgStatus"
 							 android:layout_width="wrap_content"
 		   					 android:layout_height="225px"
 							android:src="@drawable/toroff"/>
 					</TableRow>
 					<TableRow>
 						<TextView android:id="@+id/lblStatus"
 							android:text="- Press to enable - "
 							android:layout_gravity="center_horizontal"
 							android:gravity="center_horizontal"
 							android:textStyle="bold"
 							android:width="320px"
 							android:height="100px"
 							android:textColor="#ffffff"
 							 />
 					</TableRow>
 				</TableLayout>
 			</TableRow>
 		</TableLayout>
 	</ScrollView>
 </LinearLayout>
--- a/res/layout/layout_about.xml
+++ b/res/layout/layout_about.xml
@ -1,100 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent">
 	<ScrollView android:id="@+id/aboutscrollview" 
 		android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">    
 		<LinearLayout
 		    android:orientation="vertical"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent">
 		    <TextView android:text="@string/wizard_details"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"		
 				android:paddingTop="15px"
 				android:paddingLeft="15px"
 				android:textStyle="bold"
 				android:textColor="#00ff00" />	
 			<TextView android:text="@string/wizard_details_msg"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:autoLink="web"
 				android:textColorLink="#ffffff"
 				android:paddingLeft="15px"		
 				android:textColor="#ffffff" />
 			<TextView android:text="Version: "
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:paddingTop="15px"
 				android:paddingLeft="15px"
 				android:textStyle="bold"
 				android:textColor="#00ff00" />
 			<TextView android:text="- Unknown -"
 				android:id="@+id/versionName"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:paddingLeft="15px"		
 				android:layout_gravity="center_vertical"
 				android:textColor="#ffffff" />	
 			<TextView android:text="Project Home(s): "
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"		
 				android:paddingTop="15px"
 				android:paddingLeft="15px"
 				android:textStyle="bold"
 				android:textColor="#00ff00" />
 			<TextView android:text="https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:autoLink="web"
 				android:textColorLink="#ffffff"
 				android:paddingLeft="15px"		
 				android:textColor="#ffffff" />
 			<TextView android:text="License: "
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:paddingTop="15px"
 				android:paddingLeft="15px"
 				android:textStyle="bold"
 				android:textColor="#00ff00" />	
 			<TextView android:text="The Tor License"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:paddingLeft="15px"								
 				android:textColor="#ffffff" />	
 			<TextView android:text="https://torproject.org"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:autoLink="web"
 				android:textColorLink="#ffffff"
 				android:paddingLeft="15px"		
 				android:textColor="#ffffff" />				
 			<TextView android:text="3rd-Party-Software: "
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"		
 				android:paddingTop="15px"
 				android:paddingLeft="15px"
 				android:textStyle="bold"
 				android:textColor="#00ff00" />	
 			<TextView android:text="Tor v0.2.2.14: https://www.torproject.org"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:autoLink="web"
 				android:textColorLink="#ffffff"
 				android:paddingLeft="15px"
 				android:textColor="#ffffff" />				
 			<TextView android:text="LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:autoLink="web"
 				android:textColorLink="#ffffff"
 				android:paddingLeft="15px"	
 				android:textColor="#ffffff" />	
 			</LinearLayout>
 		</ScrollView>			
 </LinearLayout>
--- a/res/layout/layout_apps.xml
+++ b/res/layout/layout_apps.xml
@ -1,9 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:duplicateParentState="false">
 <TextView android:text="Select apps to use with Tor:"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:textSize="16sp"		
 				android:padding="3px" />
 	<ListView android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/applistview"></ListView>
 </LinearLayout>
--- a/res/layout/layout_apps_item.xml
+++ b/res/layout/layout_apps_item.xml
@ -1,16 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:stretchColumns="1">
    <TableRow>
    <ImageView android:id="@+id/itemicon" android:layout_width="wrap_content" android:layout_height="wrap_content"  android:padding="3dip"></ImageView>
 <TextView android:layout_height="wrap_content" android:id="@+id/itemtext" android:text="uid:packages"  android:textSize="18sp"  android:padding="3dip"></TextView>
 <CheckBox  android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/itemcheck" ></CheckBox>
    </TableRow>
 </TableLayout>
--- a/res/layout/layout_help.xml
+++ b/res/layout/layout_help.xml
@ -1,20 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content">
 	<ScrollView android:id="@+id/helpscrollview" 
 		android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">    
 		<LinearLayout
 		    android:orientation="vertical"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent">
 			<TextView android:text=""
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:textColor="#ffffff" />				
 			</LinearLayout>
 		</ScrollView>			
 </LinearLayout>
--- a/res/layout/layout_log.xml
+++ b/res/layout/layout_log.xml
@ -1,53 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:background="@drawable/bgtitanium">
    	<RelativeLayout android:id="@+id/layoutHeaderMain"
 		android:layout_width="fill_parent"
 		android:layout_height="30dp"
 		android:layout_gravity="center_horizontal"
 		android:background="#A0909090">
        <ImageView android:id="@+id/radioModeImage"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
 			android:layout_marginTop="0px"
 			android:layout_marginRight="3px"
 			android:gravity="right"
 			android:layout_toRightOf="@+id/radioModeLabel"
 			android:layout_alignParentRight="true"
 			android:layout_alignParentTop="true"
 			android:src="@drawable/tor25"
 			/>
 		<TextView android:id="@+id/radioModeText"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"           
            android:text="@string/powered_by"
 			android:layout_marginTop="9px"
 			android:layout_marginRight="0px"
 			android:gravity="right"
 			android:layout_toLeftOf="@+id/radioModeImage"
            android:textColor="#333333" />
 	</RelativeLayout>
     <ScrollView  android:orientation="vertical"
      android:layout_height="wrap_content"
         android:layout_width="fill_parent"  android:id="@+id/logScrollView"
          xmlns:android="http://schemas.android.com/apk/res/android">
         <TextView android:id="@+id/messageLog"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:layout_x="2px"
 		 android:layout_y="2px"
         android:textSize="14px"
         android:background="#A0222222"
         />	
 	</ScrollView>
     </LinearLayout>
--- a/res/layout/layout_main.xml
+++ b/res/layout/layout_main.xml
@ -1,76 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:background="@drawable/bgtitanium">
    	<RelativeLayout android:id="@+id/layoutHeaderMain"
 		android:layout_width="fill_parent"
 		android:layout_height="30dp"
 		android:layout_gravity="center_horizontal"
 		android:background="#A0909090">
        <ImageView android:id="@+id/radioModeImage"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
 			android:layout_marginTop="0px"
 			android:layout_marginRight="3px"
 			android:gravity="right"
 			android:layout_toRightOf="@+id/radioModeLabel"
 			android:layout_alignParentRight="true"
 			android:layout_alignParentTop="true"
 			android:src="@drawable/tor25"
 			/>
 		<TextView android:id="@+id/radioModeText"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"           
            android:text="@string/powered_by"
 			android:layout_marginTop="9px"
 			android:layout_marginRight="0px"
 			android:gravity="right"
 			android:layout_toLeftOf="@+id/radioModeImage"
            android:textColor="#333333" />
 	</RelativeLayout>
   <ScrollView android:id="@+id/mainview" 
 		android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">
   		<TableLayout android:id="@+id/mainLayout"
 			android:layout_gravity="center"
 			android:layout_height="wrap_content" 
 			android:layout_width="wrap_content">
 			<TableRow android:id="@+id/startRow">
 				<TableLayout
 					android:layout_gravity="center"
 					android:layout_height="wrap_content" 
 					android:layout_width="wrap_content">
 					<TableRow>
 							<ImageView
 							android:id="@+id/imgStatus"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:src="@drawable/toroff"/>
 					</TableRow>
 					<TableRow>
 						<TextView android:id="@+id/lblStatus"
 							android:text="@string/press_to_start"
 							android:layout_gravity="center_horizontal"
 							android:gravity="center_horizontal"
 							android:textStyle="bold"
 							android:width="300px"
 							android:height="75px"
 							android:textColor="#ffffff"
 							 />
 					</TableRow>
 				</TableLayout>
 			</TableRow>
 		</TableLayout>
 	</ScrollView>
 </LinearLayout>
--- a/res/layout/layout_settings.xml
+++ b/res/layout/layout_settings.xml
@ -1,29 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent">
        <ScrollView  android:layout_height="380px"
            android:layout_width="fill_parent">
            <EditText android:id="@+id/textSettings"
            android:layout_height="fill_parent"
            android:layout_width="fill_parent"
            android:layout_weight="1.0"
            android:singleLine="false"
            android:textSize="11px"
            />	
        </ScrollView>
          <Button android:id="@+id/btnSettingsSave" 
            android:layout_width="fill_parent" 
            android:layout_height="40px" 
             android:text="Save Settings"        
             android:layout_margin="0sp"
            />
 </LinearLayout>
--- a/res/layout/layout_wizard.xml
+++ b/res/layout/layout_wizard.xml
@ -1,22 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content">
 	<ScrollView android:id="@+id/helpscrollview" 
 		android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">    
 		<LinearLayout
 		    android:orientation="vertical"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent">
 			<TextView android:text=""
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:textColor="#ffffff" />				
 			</LinearLayout>
 		</ScrollView>			
 </LinearLayout>
--- a/res/layout/layout_wizard_proxy_help.xml
+++ b/res/layout/layout_wizard_proxy_help.xml
@ -1,24 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content">
 	<ScrollView android:id="@+id/helpscrollview" 
 		android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">    
 		<LinearLayout
 		    android:orientation="vertical"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent"
 		    android:padding="3px">
 <TextView android:text="@string/wizard_proxy_help_msg" 	android:textColor="#ffffff" android:id="@+id/WizardRootTextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
 			</LinearLayout>
 		</ScrollView>			
 </LinearLayout>
--- a/res/layout/layout_wizard_root.xml
+++ b/res/layout/layout_wizard_root.xml
@ -1,29 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content">
 	<ScrollView android:id="@+id/helpscrollview" 
 		android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">    
 		<LinearLayout
 		    android:orientation="vertical"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent"
 		    android:padding="3px">
 <TextView android:text="@string/wizard_configure_msg" 	android:textColor="#ffffff" android:id="@+id/WizardRootTextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
 <CheckBox android:layout_marginTop="20px" android:text="@string/wizard_configure_all" android:id="@+id/WizardRootCheckBox01" android:layout_width="wrap_content" android:layout_height="wrap_content"></CheckBox>
 <TextView android:text="  or  " 	android:textColor="#ffffff"  android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
 <Button android:text="@string/wizard_configure_select_apps" android:id="@+id/WizardRootButton01" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 			</LinearLayout>
 		</ScrollView>			
 </LinearLayout>
--- a/res/layout/layout_wizard_stock.xml
+++ b/res/layout/layout_wizard_stock.xml
@ -1,31 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content">
 	<ScrollView android:id="@+id/helpscrollview" 
 		android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">    
 		<LinearLayout
 		    android:orientation="vertical"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent"
 		    android:padding="3px">
 <TextView android:text="@string/wizard_permissions_msg_stock" 	android:textColor="#ffffff" android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
 <Button android:text="@string/wizard_permission_enable_root" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonEnable" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 <TextView android:text="@string/wizard_permissions_no_root" android:layout_marginTop="10px"	android:textColor="#ffffff" android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
 <CheckBox  android:text="@string/wizard_permissions_consent" android:id="@+id/CheckBoxConsent" android:layout_width="wrap_content" android:layout_height="wrap_content"></CheckBox>
 			</LinearLayout>
 		</ScrollView>			
 </LinearLayout>
--- a/res/layout/layout_wizard_tips.xml
+++ b/res/layout/layout_wizard_tips.xml
@ -1,29 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content">
 	<ScrollView android:id="@+id/helpscrollview" 
 		android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">    
 		<LinearLayout
 		    android:orientation="vertical"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent"
 		    android:padding="3px">
 <TextView android:text="@string/wizard_tips_msg" android:layout_gravity="left"	android:textColor="#ffffff" android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
 <Button android:text="@string/wizard_tips_otrchat"  android:layout_gravity="left" android:drawableLeft="@drawable/icon_otrchat"  android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOtrchat" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 <Button android:text="@string/wizard_tips_orweb"  android:drawableLeft="@drawable/icon_orweb" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOrweb" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 <Button android:text="@string/wizard_tips_proxy" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonProxyHelp" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 			</LinearLayout>
 		</ScrollView>			
 </LinearLayout>
--- a/res/layout/layout_wizard_welcome.xml
+++ b/res/layout/layout_wizard_welcome.xml
@ -1,24 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content">
 	<ScrollView android:id="@+id/helpscrollview" 
 		android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">    
 		<LinearLayout
 		    android:orientation="vertical"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent"
 		    android:padding="3px">
 <TextView android:text="@string/wizard_welcome_msg" 	android:textColor="#ffffff" android:id="@+id/WizardRootTextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
 			</LinearLayout>
 		</ScrollView>			
 </LinearLayout>
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@ -1,130 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">اوربوت (Orbot)</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">بدء وإيقاف تور</string>
    <string name="tor_proxy_service_process">خدمة وكيل تور</string>
 <string name="status_starting_up">اوربوت يبدأ...</string>
 <string name="status_activated">متصل بشبكة تور</string>
 <string name="status_disabled">"تم إيقاف اوربوت</string>
 <string name="status_shutting_down">جاري إغلاق اوربوت</string>
 <string name="tor_process_connecting">بدء تور...</string>
 <string name="tor_process_connecting_step2">ضبط التحكم...</string>
 <string name="tor_process_connecting_step3">مكتمل.</string>
 <string name="tor_process_connecting_step4">انتظار.</string>
 <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية الى الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام HTTP proxy 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string>
 <string name="menu_home">الصفحة الرئيسية</string>
 <string name="menu_browse">تصفّح</string>
 <string name="menu_settings">إعدادات</string>
 <string name="menu_log">السجل</string>
 <string name="menu_info">مساعدة</string>
 <string name="menu_apps">تطبيقات</string>
 <string name="menu_start">بدء</string>
 <string name="menu_stop">إيقاف</string>
 <string name="button_help">مساعدة</string>
 <string name="button_close">إغلاق</string>
 <string name="button_about">حول</string>
 <string name="button_clear_log">Clear Log</string>
 <string name="menu_verify">فحص</string>
 <string name="menu_exit">خروج</string>
 <string name="powered_by">بدعم من مشروع تور</string>
 <string name="press_to_start">- اضغط للبدء -</string>
 <string name="pref_trans_proxy_group">عملية توكيل غير مرئية أو ضمنية (يتطلب حقوق المسؤول- Root-)</string>
 <string name="pref_trans_proxy_title">عملية توكيل غير مرئية أو ضمنية</string>
 <string name="pref_trans_proxy_summary">عملية توريفاي أوتوماتيكية للتطبيقات</string>
 <string name="pref_transparent_all_title">تور كل شيء</string>
 <string name="pref_transparent_all_summary">حركة مرور الوكيل لجميع التطبيقات عبر تور</string>
 <string name="status_install_success">تم تثبيت ثنائيات تور بنجاح!</string>
 <string name="status_install_fail">غير قادر على تثبيت ملفات ثنائيات تور. يرجى التحقق من السجل وإعلامنا على البريد الإلكتروني tor-assistants@torproject.org</string>
 <string name="title_error">خطأ في التطبيق</string>
 <string name="wizard_title">مرحبا بك في أوربوت</string>
 <string name="wizard_btn_tell_me_more">عن أوربوت</string>
 <string name="btn_next">التالي</string>
 <string name="btn_back">رجوع</string>
 <string name="btn_finish">إنهاء</string>
 <string name="btn_okay">موافق</string>
 <string name="btn_cancel">إلغاء</string>
 <!-- Welcome Wizard strings (DJH) -->
    <string name="wizard_welcome_msg">بفضل أوربوت، صار ممكنا استعمال تور في أندرويد. تور هو برنامج مجاني وشبكة مفتوحة تساعد على حمايتك من مراقبة الشبكات التي تهدد الخصوصية والحرية الشخصية والعلاقات والأنشطة التجارية السرية ورقابة الدول المعروفة بإسم تحليل حركة المرور.
 *تحذير: *تثبيت أوربوت على جهازك_لن_يقوم بإخفاء تحركات حركة مرورك بشكل سحري! سوف يساعدك هذا المعالج على البدء.</string>
    <string name="wizard_details">بعض التفاصيل عن أوربوت</string>
    <string name="wizard_details_msg">أوربوت هو تطبيق مفتوح المصدر والذي يضم تور, LibEvent وPrixovy. يعمل على توفير وكيل HTTP محلي (8118) ووكيل SOCKS (9050) إلى شبكة تور. يتوفر لدى أوربوت القدرة على إرسال جميع حركات مرور الانترنت من خلال تور على الجهاز ذات حقوق المسؤول (root). </string>
    <string name="wizard_permissions_root">تم منح الإذن</string>
    <string name="wizard_permissions_stock">أذونات أوربوت</string>
    <string name="wizard_premissions_msg_root">ممتاز! لقد وجدنا بأنه لديك أذونات حقوق المسؤول (root) لتمكين أوربوت. سوف نستخدم هذه السلطة بحكمة.</string>
    <string name="wizard_permissions_msg_stock">رغم أنه ليس ضروريا، يمكن ان يصبح أوربوت أداة قوية إذا كان لدى جهازك صلاحية حقوق المسؤول (root). استخدم الزر بالأسفل لمنح أوربوت قوة أكبر!</string>
    <string name="wizard_permissions_no_root">إذا لم يكن لديك صلاحية حقوق المسؤول (root) أو ليست لديك أدنى فكرة عما نتحدث عنه، تأكد فقط من استخدام تطبيقات تعمل مع أوربوت.</string>
    <string name="wizard_permissions_consent">أفهم ذلك وأود أن أستمر بدون حقوق المسؤول (root)</string>
    <string name="wizard_permission_enable_root">منح أوربوت حقوق المسؤول (root)</string>
    <string name="wizard_configure">تكوين توريفاي</string>
    <string name="wizard_configure_msg">أوربوت يعطيك الخيار لتوجيه جميع حركات مرور التطبيقات عبر تور OR لإختيار تطبيقاتك بشكل فردي.</string> 
    <string name="wizard_configure_all">توكيل جميع التطبيقات عبر تور</string>
    <string name="wizard_configure_select_apps">اختر التطبيقات الفردية لتور</string>
    <string name="wizard_tips_tricks">تطبيقات مهيئة لأوربوت</string>
    <string name="wizard_tips_msg">نشجعكم على تحميل واستخدام التطبيقات التي تعرف كيفية الاتصال مباشرة بأوربوت. اضغط على الأزرار في الأسفل للتثبيت.</string>
    <string name="wizard_tips_otrchat">OTRCHAT - عميل التراسل الفوري الآمن للأندرويد</string>
    <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string>
    <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string>
    <string name="wizard_proxy_help_info">إعدادات الوكيل</string>
    <string name="wizard_proxy_help_msg">اذا كان تطبيق أندرويد الذي تستخدمه يمكن ان يدعم استخدام وكيل HTTP او SOCKS , عندها يمكنك تكوينه للإتصال بأوربوت واستخدام تور.
    اعدادات المستضيف هي 127.0.0.1 او "المستضيف المحلي". بالنسبة الى HTTP, فإن ضبط المنفذ هو 8118. بالنسبة الى SOCKS, فإن الوكيل هو 9050. يجب عليك استخدام SOCKS4A او SOCKS5 اذا امكن.
    يمكنك معرفة المزيد عن عملية توكيل غير مرئية للأندرويد عن طريق الأسئلة المتداولة (FAQ)  في: http://tinyurl.com/proxyandroid
    </string>
    <string name="wizard_final">أوربوت جاهز!</string>
    <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة: الصحفيين والمدونين، والعاملين في مجال حقوق الإنسان، والجنود والشركات والمواطنين من الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لأن تستخدمه كذلك!</string>
    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
 <!-- END Welcome Wizard strings (DJH) -->
 	<string name="connect_first_time"> لقد قمت بإتصال ناجح الى شبكة تور - لكن هذا لا يعني بأن جهازك في مأمن. يمكنك استخدام خيار \'تحقق\' من القائمة لإختبار المتصفح الخاص بك. 
 قم بزيارتنا على https://guardianproject.info/apps/orbot او ارسل رسالة الكترونية الى help@guardianproject.info لمعرفة المزيد.</string>
 	<string name="tor_check">سيؤدي هذا إلى فتح المتصفح الافتراضي الخاص بك على العنوان https://check.torproject.org من اجل التحقق من تكوين أوربوت بشكل صحيح وبأنك متصل بتور.</string>
    <string name="pref_hs_group">خدمات خفية</string>
    <string name="pref_general_group">General</string>
    <string name="pref_start_boot_title">Start Orbot on Boot</string>
    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@ -1,123 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="pref_hs_group">Versteckte Dienste</string>
    <string name="app_name">Orbot</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">starte und beende Tor</string>
    <string name="tor_proxy_service_process">Tor Proxydienst</string>
 <string name="status_starting_up">Orbot startet...</string>
 <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string>
 <string name="status_disabled">"Orbot ist deaktiviert</string>
 <string name="status_shutting_down">Orbot wird beendet</string>
 <string name="tor_process_connecting">Starte Tor...</string>
 <string name="tor_process_connecting_step2">Baue Kontrollverbindung auf...</string>
 <string name="tor_process_connecting_step3">erfolgreich abgeschlossen.</string>
 <string name="tor_process_connecting_step4">warte.</string>
 <string name="not_anonymous_yet">WARNUNG: Die Verbindung ist noch nicht anonymisiert! Bitte stellen Sie Ihre Programme so ein, dass sie entwederden  HTTP proxy 127.0.0.1:8118, SOCKS4A oder SOCKS proxy 127.0.0.1:9050 nutzen.</string>
 <string name="menu_home">Home</string>
 <string name="menu_browse">Durchstöbern</string>
 <string name="menu_settings">Einstellungen</string>
 <string name="menu_log">Log</string>
 <string name="menu_info">Hilfe</string>
 <string name="menu_apps">Apps</string>
 <string name="menu_start">Start</string>
 <string name="menu_stop">Stop</string>
 <string name="button_help">Hilfe</string>
 <string name="button_close">Schließen</string>
 <string name="button_about">Über</string>
 <string name="button_clear_log">Clear Log</string>
 <string name="menu_verify">Überprüfen</string>
 <string name="menu_exit">Beenden</string>
 <string name="powered_by">ermöglicht durch das Tor Projekt</string>
 <string name="press_to_start">- zum Starten drücken -</string>
 <string name="pref_trans_proxy_group">Transparenter Proxy (nur gerootete Geräte)</string>
 <string name="pref_trans_proxy_title">Transparenter Proxy</string>
 <string name="pref_trans_proxy_summary">Anwendungen automatisch durch Tor leiten</string>
 <string name="pref_transparent_all_title">Alles durch Tor leiten</string>
 <string name="pref_transparent_all_summary">Verbindungen aller Anwendungen durch Tor leiten</string>
 <string name="status_install_success">Die Tor-Pakete wurden erfolgreich installiert!</string>
 <string name="status_install_fail">Die Tor Pakete konnten nicht erfolgreich installiert werden. Bitte prüfe das Logfile und wende Dich an tor-assistants@torproject.org.</string>
 <string name="title_error">Anwendungsfehler</string>
 <string name="wizard_title">Willkommen bei Orbot</string>
 <string name="wizard_btn_tell_me_more">Über Orbot</string>
 <string name="btn_next">Weiter</string>
 <string name="btn_back">Zurück</string>
 <string name="btn_finish">Fertigstellen</string>
 <string name="btn_okay">OK</string>
 <string name="btn_cancel">Abbrechen</string>
 <!-- Welcome Wizard strings (DJH) -->
    <string name="wizard_welcome_msg">Orbot bringt Tor auf Android Geräte. Tor ist ein freies Programm und ein offenes Netzwerk, dass Ihnen hilft sich gegen Datenverkehrsüberwachung zu wehren, eine Form der Onlineüberwachung, die Ihre persönliche Freiheit, Privatsphäre, vertrauliche Geschäfte und Geschäftseziehungen bedroht.
 *WARNUNG:* Durch die Installation von Orbot wird _nicht_ sofort Ihr kompletter Datenverkehr anonymisiert! Hilfestellung erhalten Sie von diesem Assitenten.</string>
    <string name="wizard_details">Nähere Informationen zu Orbot</string>
    <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
    <string name="wizard_permissions_root">Erlaubnis erteilt</string>
    <string name="wizard_permissions_stock">Orbot Permissions</string>
    <string name="wizard_premissions_msg_root">Exzellent! Wir haben festgestellt, dass sie Orbot Root-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen.</string>
    <string name="wizard_permissions_msg_stock">Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn sie ihn Root-Rechte einräumen. Drücken sie auf den Kopf unten um Orbot diese Superkräfte einzuräumen.</string>
    <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
    <string name="wizard_permissions_consent">I understand and would like to continue without root</string>
    <string name="wizard_permission_enable_root">Orbot Root-Rechte einräumen</string>
    <string name="wizard_configure">Configure Torification</string>
    <string name="wizard_configure_msg">Orbot gibt ihnen die Wahl den Datenverkehr aller Programme durch Tor zu leiten ODER die Wahl für alle Programme einzeln zu treffen.</string> 
    <string name="wizard_configure_all">Den Verkehr aller Programme durch Tor leiten</string>
    <string name="wizard_configure_select_apps">Programme einzeln wählen</string>
    <string name="wizard_tips_tricks">Programme, für die Orbot aktiviert ist</string>
    <string name="wizard_tips_msg">Wir raten ihnen Programme herunterzuladen &amp; zu nutzen, die wissen, wie sie sich direkt mit Orbot verbinden. Klicken sie zum Installieren auf den Knopf unten.</string>
    <string name="wizard_tips_otrchat">OTRCHAT - Ein sicheres Instant-Messaging-Programm für Android</string>
    <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp; Orbot entworfener Browser</string>
    <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
    <string name="wizard_proxy_help_info">Proxy Settings</string>
    <string name="wizard_proxy_help_msg">Wenn das Android-Programm, das du benutzt, die Verwendung von HTTP- oder SOCKS-Proxys unterstützt kannst du es konfigurieren sich mit Orbot zu verbinden und Tor zu nutzen.
 Die Host-Einstellungen sind 127.0.0.1 oder "localhost". Die Port-Einstellungen sind 8118 für HTTP und 9050 für SOCKS. Sie sollten versuchen SOCKS4A oder SOCKS5 zu benutzen.
 Erfahren sie mehr über die Verwendung von Proxys unter Android im FAQ unter http://tinyurl.com/proxyandroid
 </string>
    <string name="wizard_final">Orbot is ready!</string>
    <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und sind sie ebenfalls bereit!</string>
    <string name="otrchat_apk_url">https://guardianproject/getgibber</string>
    <string name="orweb_apk_url">https://guardianproject/getorweb</string>
 <!-- END Welcome Wizard strings (DJH) -->
 	<string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - das bedeutet aber NICHT, dass dein Gerät sicher ist. Du kannst die \'Überprüfen\'-Option aus dem Menü benutzen, um deinen Browser zu testen. 
 Besuchen sie https://guardianproject.info/apps/orbot oder senden sie eine E-Mail an help@guardianproject.info um mehr zu erfahren.</string>
 	<string name="tor_check">This will open your default web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
 </resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@ -1,130 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Orbot</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">iniciar y detener Tor</string>
    <string name="tor_proxy_service_process">torproxyservice</string>
 <string name="status_starting_up">Orbot está iniciando...</string>
 <string name="status_activated">Conectado a la Red de Tor</string>
 <string name="status_disabled">"Orbot está desactivado</string>
 <string name="status_shutting_down">Orbot se está cerrando</string>
 <string name="tor_process_connecting">Iniciando Tor...</string>
 <string name="tor_process_connecting_step2">Configurción de control...</string>
 <string name="tor_process_connecting_step3">completo.</string>
 <string name="tor_process_connecting_step4">esperando.</string>
 <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Por favor, configure sus aplicaciones para usar el Proxy HTTP 127.0.0.1:8118, el SOCKS4A o el Proxy SOCKS5 127.0.0.1:9050</string>
 <string name="menu_home">Principal</string>
 <string name="menu_browse">Examinar</string>
 <string name="menu_settings">Configuración</string>
 <string name="menu_log">Historial</string>
 <string name="menu_info">Ayuda</string>
 <string name="menu_apps">Aplicaciones</string>
 <string name="menu_start">Iniciar</string>
 <string name="menu_stop">Detener</string>
 <string name="button_help">Ayuda</string>
 <string name="button_close">Cerrar</string>
 <string name="button_about">Acerca de</string>
 <string name="button_clear_log">Limpiar Historial</string>
 <string name="menu_verify">Comprobar</string>
 <string name="menu_exit">Salir</string>
 <string name="powered_by">potenciado por Tor Project</string>
 <string name="press_to_start">- presione para comenzar -</string>
 <string name="pref_trans_proxy_group">Proxy transparente (Requiere ser Administrador)</string>
 <string name="pref_trans_proxy_title">Proxy transparente</string>
 <string name="pref_trans_proxy_summary">Torificado automático de las Aplicaciones</string>
 <string name="pref_transparent_all_title">Pasar todo el tráfico por Tor</string>
 <string name="pref_transparent_all_summary">Tráfico Proxy para todas las aplicaciones mediante Tor</string>
 <string name="status_install_success">¡Binarios de Tor instalados con éxito!</string>
 <string name="status_install_fail">Los archivos binarios de Tor no se han podido instalar. Por favor, verifique el Historial y notifique a: tor-assistants@torproject.org</string>
 <string name="title_error">Error de aplicación</string>
 <string name="wizard_title">Bienvenido a Orbot</string>
 <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
 <string name="btn_next">Siguiente</string>
 <string name="btn_back">Atrás</string>
 <string name="btn_finish">Finalizar</string>
 <string name="btn_okay">OK</string>
 <string name="btn_cancel">Cancelar</string>
 <!-- Welcome Wizard strings (DJH) -->
    <string name="wizard_welcome_msg">Orbot proporciona Tor a Android. Tor es un software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia que amenaza su libertad y privacidad personal, la confidencialidad en los negocios y en las relaciones, y la seguridad del Estado conocida como análisis de tráfico.
 *ADVERTENCIA:* ¡Instalando Orbot _NO_ anonimizará mágicamente su tráfico del móvil! Este assitente le ayudará a empezar.</string>
    <string name="wizard_details">Algunos detalles de Orbot</string>
    <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, LibEvent y Privoxy. Provee un Proxy HTTP local (8118) y un Proxy SOCKS (9050) en la red Tor. Orbot también tiene la habilidad, en un dispositivo enrutador, de enviar todo el tráfico de Internet a través de Tor.</string>
    <string name="wizard_permissions_root">Permiso Concedido</string>
    <string name="wizard_permissions_stock">Permisos de Orbot</string>
    <string name="wizard_premissions_msg_root">¡Excelente! Hemos detectado que usted tiene permisos administravitos activados para Orbot. Utilizaremos estos poderes sabiamente.</string>
    <string name="wizard_permissions_msg_stock">Mientras no sea requerido, Orbot puede convertirse en una herramienta aún más poderosa si su dispositivo tiene acceso de administrador. Utilice el botón a continuación para conceder superpoderes a Orbot</string>
    <string name="wizard_permissions_no_root">Si no tiene acceso de admnistrador o no tiene idea de qué estamos hablando, sólo asegúrese de utilizar aplicaciones hechas para trabajar con Orbot.</string>
    <string name="wizard_permissions_consent">Comprendo y quiero continuar sin poderes administrativos</string>
    <string name="wizard_permission_enable_root">Conceder poderes administrativos a Orbot</string>
    <string name="wizard_configure">Configurar Torificación</string>
    <string name="wizard_configure_msg">Orbot le da la opción de dirigir todo el tráfico de las aplicaciones a través de Tor O de seleccionar sus aplicaciones individualmente.</string> 
    <string name="wizard_configure_all">Configurar Proxy para todas las aplicaciones a través de Tor</string>
    <string name="wizard_configure_select_apps">Seleccionar aplicaciones individualmente para Tor</string>
    <string name="wizard_tips_tricks">Aplicaciones activas en Orbot</string>
    <string name="wizard_tips_msg">Le invitamos a descargar y utilizar aplicaciones que saben cómo conectarse directamente a Orbot. Haga clic en los botones a continuación para Instalar.</string>
    <string name="wizard_tips_otrchat">OTRCHAT - Cliente de mensajería instantánea seguro para Android</string>
    <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string>
    <string name="wizard_tips_proxy">Configuraciones Proxy - Aprenda cómo configurar aplicaciones para que trabajen con Orbot</string>
    <string name="wizard_proxy_help_info">Configuraciones Proxy</string>
    <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un Proxy HTTP o SOCKS, entonces puede configurarla para conectar a Orbot y utilizar Tor.
 La configuración del dominio es 127.0.0.1 o "localhost". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy es 9050. Puede utilizar SOCKS4A o SOCKS5 si es posible.
 Puede aprender más acerca de los proxys en Android a través de las Preguntas Frecuentes ubicadas en: http://tinyurl.com/proxyandroid
    </string>
    <string name="wizard_final">¡Orbot está listo!</string>
    <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora también lo estás!</string>
    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
 <!-- END Welcome Wizard strings (DJH) -->
 	<string name="connect_first_time">Se ha conectado con éxito a la red Tor, pero eso NO significa que su dispositivo es seguro. Puede utilizar la opción \'Comprobar\' desde el menú para probar su navegador.
 Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo electrónico a help@guardianproject.info para aprender más.</string>
 	<string name="tor_check">Esto abrirá https://check.torproject.org en su navegador predeterminado con el fin de comprobar si Orbot está configurado y si está conectado a Tor.</string>
    <string name="pref_hs_group">Servicios Ocultados</string>
    <string name="pref_general_group">General</string>
    <string name="pref_start_boot_title">Start Orbot on Boot</string>
    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
 </resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@ -1,118 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">اوربات</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">شروع و پایان Tor</string>
    <string name="tor_proxy_service_process">سرويس پروكسي تُر</string>
 <string name="status_starting_up">Orbat آغاز می شود..</string>
 <string name="status_activated">پیوسته به شبکه ی Tor</string>
 <string name="status_disabled">اوربات غیرفعال شده است.</string>
 <string name="status_shutting_down">اوربات در حال بسته شدن است.</string>
 <string name="tor_process_connecting">شروع تُر ...</string>
 <string name="tor_process_connecting_step2">راه اندازی نظارت...</string>
 <string name="tor_process_connecting_step3">كامل شد.</string>
 <string name="tor_process_connecting_step4">در انتظار.</string>
 <string name="not_anonymous_yet">هشدار: فعالیت شما هنوز "گمنام" نیست! لطفن اپلیکیشن خود را تنظیم کنید تا از HTTP پروکسی 127.0.0.1:8118 و یا SOCKS4A و یا SOCKS5 پروکسی 127.0.01:9050 استفاده کند.</string>
 <string name="menu_home">خانه</string>
 <string name="menu_browse">جستجو</string>
 <string name="menu_settings">تنظیمات</string>
 <string name="menu_log">ورود</string>
 <string name="menu_info">کمک</string>
 <string name="menu_apps">واژ ه نامه</string>
 <string name="menu_start">آغاز</string>
 <string name="menu_stop">ایست</string>
 <string name="button_help">کمک</string>
 <string name="button_close">بسته</string>
 <string name="button_about">درباره</string>
 <string name="button_clear_log">Clear Log</string>
 <string name="menu_verify">بررسی</string>
 <string name="menu_exit">خروج</string>
 <string name="powered_by">فعال شده توسط Tor Project</string>
 <string name="press_to_start">برای شروع، کلیک کنید.</string>
 <string name="pref_trans_proxy_group">پروکسیدن شفاف (نیاز به Root دارد)</string>
 <string name="pref_trans_proxy_title">پروکسیدن شفاف</string>
 <string name="pref_trans_proxy_summary">Tori-نمایی اتوماتیک اپلیکیشن ها</string>
 <string name="pref_transparent_all_title">شامل همه</string>
 <string name="pref_transparent_all_summary">فعالیت همه اپلیکیشن ها را از طریق Tor پروکسی کنید.</string>
 <string name="status_install_success">دوتایی های Tor با موفقیت نصب شدند!</string>
 <string name="status_install_fail">نصب فایل های دوتایی Tor ممکن نبود. لطفن قطعه را وارسی کنید و به tor-assistance@torproject.org اطلاع دهید.</string>
 <string name="title_error">خطای اپلیکیشین</string>
 <string name="wizard_title">به اوربات خوش آمدید</string>
 <string name="wizard_btn_tell_me_more">درباره اوربات</string>
 <string name="btn_next">بعدی</string>
 <string name="btn_back">بازگشت</string>
 <string name="btn_finish">پایان</string>
 <string name="btn_okay">لغو</string>
 <string name="btn_cancel">لغو</string>
 <!-- Welcome Wizard strings (DJH) -->
    <string name="wizard_welcome_msg">اوربات Tor را به آندرونید وارد می کند. Tor نرم افزاری رایگان و شبکه ای باز است که در مقابل تهدید شبکه های نظارتی علیه آزادی و حریم فردی، فعالیت ها و روابط محرمانه شرکت ها، و امنیت ملی، که "کاوش فعالیت" معروف است، به شما کمک می کند. *هشدار:* نصب اوربات به تنهایی قادر نیست معجزه ای صورت دهد و فعالیت آنلاین شما را مخفی کند! این ابزار تنها کمک می کند که قدم اول را بردارید.</string>
    <string name="wizard_details">برخی جزئیات در مورد اوربات</string>
    <string name="wizard_details_msg">اوربات اپلیکیشنی با متن-باز است که شامل Tor, LibEvent و Privoxy. این اپلیکیشن، HTTP پروکسی (8118) محلی و SOCKS پروکسی (9050) را در شبکه Tor در دسترس قرار می دهد. اوربات همچنین قادر است بر روی ابزار root شده، تمام ترافیک اینترنت را از Tor ارسال کند.</string>
    <string name="wizard_permissions_root">مجوز صادر گردید</string>
    <string name="wizard_permissions_stock">مجوزهای اوربات</string>
    <string name="wizard_premissions_msg_root">بسیار عالی! اینطور که معلوم است شما دارای مجوز root برای فعال کردن اوربات هستید. این امکان را بخوبی مورد استفاده قرار خواهیم داد. </string>
    <string name="wizard_permissions_msg_stock">هرچند ضرورت ندارد اما اگر سیستم شما دارای دسترسی root باشد اوربات با ظرفیت بسیار بیشتری عمل خواهد کرد. دکمه زیر را فشار دهید تا اوربات دارای ظرفیت حداکثری بشود.</string>
    <string name="wizard_permissions_no_root">اگر سیستم شما دارای دسترسی root نیست و یا اصلن چیزی از این عبارت متوجه نمی شوید، حتمن سعی کنید از اپلکیشن هایی استفاده کنید که ویژه اوربات تهیه شده اند. </string>
    <string name="wizard_permissions_consent">متوجه هستم و ترجیح می دهم بدون root ادامه بدهم.</string>
    <string name="wizard_permission_enable_root">واگذاری root برای اوربات</string>
    <string name="wizard_configure">تنظیمات تبدیل به Tor</string>
    <string name="wizard_configure_msg">اوربات به شما امکان می دهد که تمام اپلیکشین ها را از طریق Tor  منتقل کنید و یا اپلیکیشن مورد نظر خود را شخصن انتخاب کنید.</string> 
    <string name="wizard_configure_all">تمام اپلیکیشن ها را از طریق Tor منتقل کنید.</string>
    <string name="wizard_configure_select_apps">اپلیکیشن های منفرد برای Tor انتخاب کنید.</string>
    <string name="wizard_tips_tricks">اپلیکیشن هایی که برای اوربات تنظیم شده اند</string>
    <string name="wizard_tips_msg">توصیه می کنیم داون لود و فعال کنید؛ اپلیکیشن هایی را استفاده کنید که مستقیم به اوربات وصل می شوند. دکمه های زیر را فشار دهید تا نصب شود. </string>
    <string name="wizard_tips_otrchat">OTRCHAT - کاربر ایمن انتقال پیام فوری برای آندروید</string>
    <string name="wizard_tips_orweb">ORWEB (فقط آندروید 1.x) - مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز اوربات</string>
    <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با اوربات</string>
    <string name="wizard_proxy_help_info">تنظیمات پروکسی</string>
    <string name="wizard_proxy_help_msg">اگر اپلیکشین آندرونوید مورد استفاده شما قابلیت کار با HTTP و یا SOCKS پروکسی دارد می توانید تنظیمش کنید تا به اوربات وصل شود و از Tor استفاده کند. تنظیمات سرویس دهنده 127.0.0.1 و یا "سرویس-ده محلی" است. برای HTTP تنظیمات درگاه (port) 8118 است. برای SOCKS، پروکسی مناسب، 9050 است. شما می بایست SOCKS4A  و یا  در صورت امکان از socks5 استفاده کنید. در صورت نیاز به اطلاعات بیشتر در مورد انتقالده آندروید، می توانید به FAQ (سوالهای معمول) در http://tinyurl.com/proxyandroid مراجعه کنید.</string>
    <string name="wizard_final">اوربات آماده استفاده میباشد!</string>
    <string name="wizard_final_msg">صدها هزار نفر در سراسر جهان به دلایل گوناگون از Tor استفاده می کنند: روزنامه نویسها و بلاگرها، کارکنان حقوق بشر، ماموران انتظامی، سربازان، شرکتها، شهروندان دولتهای سرکوبگر، و شهروندان عادی، و حالا شما نیز آماده استفاده از آن هستید!</string>
    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
 <!-- END Welcome Wizard strings (DJH) -->
 	<string name="connect_first_time">اکنون با موفقیت به شبکه Tor وصل شده اید اما به آن معنا نیست که سیستم شما ایمن است. می توانید از منیو گزینه /"Check/" را برای آزمایش مرورگر انتخاب کنید. به ما در صفحه https://guardianproject.info/apps/orbot مراجعه کنید و به آدرس help@guardianproject.info  ایمیلی بفرستید تا اطلاعات بیشتری دریافت کنید. </string>
 	<string name="tor_check">با این قدم پیشفرض مرورگر وب شما به صفحه   https://check.torproject.org باز می شود تا شما مشاهده کنید آیا اوربات تنظیم شده است و آیا شما به Tor وصل شده اید یا نه.</string>
    <string name="pref_hs_group">سرويس هاي مخفي</string>
    <string name="pref_general_group">General</string>
    <string name="pref_start_boot_title">Start Orbot on Boot</string>
    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
 </resources>
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@ -1,41 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Orbot</string>
          <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">start og stopp Tor</string>
    <string name="tor_proxy_service_process">torproxyservice</string>
 <string name="status_starting_up">Orbot starter...</string>
 <string name="status_activated">Tilkoblet Tor-nettverket</string>
 <string name="status_disabled">"Orbot er deaktivert</string>
 <string name="status_shutting_down">Orbot skrur seg av</string>
 <string name="tor_process_connecting">Starter Tor...</string>
 <string name="tor_process_connecting_step2">autentiserer kontrolltilkobling...</string>
 <string name="tor_process_connecting_step3">ferdig.</string>
 <string name="tor_process_connecting_step4">venter.</string>
 <string name="not_anonymous_yet">ADVARSEL: Trafikken din er ikke anonym helt enda! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5 proxy 127.0.0.1:9050</string>
 <string name="menu_home">Hjem</string>
 <string name="menu_browse">Gå til</string>
 <string name="menu_settings">Innstillinger</string>
 <string name="menu_log">Logg</string>
 <string name="menu_info">Hjelp</string>
 <string name="menu_apps">Applikasjoner</string>
 <string name="menu_start">Start</string>
 <string name="menu_stop">Stopp</string>
 <string name="button_help">Hjelp</string>
 <string name="button_close">Avslutt</string>
 <string name="button_about">Om</string>
 <string name="menu_verify">Check</string>
 <string name="menu_exit">Exit</string>
 </resources>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@ -1,129 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Orbot</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">start en stop Tor</string>
    <string name="tor_proxy_service_process">torproxydienst</string>
 <string name="status_starting_up">Orbot is aan het starten...</string>
 <string name="status_activated">Aangesloten op het Tor netwerk</string>
 <string name="status_disabled">Orbot is uitgeschakeld</string>
 <string name="status_shutting_down">Orbot is aan het afsluiten</string>
 <string name="tor_process_connecting">Bezig met opstarten van Tor...</string>
 <string name="tor_process_connecting_step2">Bezig met instellen aansturing</string>
 <string name="tor_process_connecting_step3">klaar.</string>
 <string name="tor_process_connecting_step4">aan het wachten.</string>
 <string name="not_anonymous_yet">WAARSCHUWING: Uw verkeer is nog niet anononiem! Stel uw programma\'s alstublieft in dat ze gebruik maken van HTTP proxy 127.0.0.1:8118 of SOCKS4A of SOCKS5 proxy 127.0.0.1:9050</string>
 <string name="menu_home">Thuis</string>
 <string name="menu_browse">Bladeren</string>
 <string name="menu_settings">Instellingen</string>
 <string name="menu_log">Logboek</string>
 <string name="menu_info">Hulp</string>
 <string name="menu_apps">Applicaties</string>
 <string name="menu_start">Start</string>
 <string name="menu_stop">Stop</string>
 <string name="button_help">Hulp</string>
 <string name="button_close">Afsluiten</string>
 <string name="button_about">Over</string>
 <string name="button_clear_log">Wis logboek</string>
 <string name="menu_verify">Controleer</string>
 <string name="menu_exit">Verlaten</string>
 <string name="powered_by">aangedreven door het Tor Project</string>
 <string name="press_to_start">- druk om te starten -</string>
 <string name="pref_trans_proxy_group">Transparant Proxyen (Vereist Root)</string>
 <string name="pref_trans_proxy_title">Transparant Proxyen</string>
 <string name="pref_trans_proxy_summary">Automatisch Tor forceren van aplicaties</string>
 <string name="pref_transparent_all_title">Tor Alles</string>
 <string name="pref_transparent_all_summary">Proxy verkeer voor alle toepasingen door Tor</string>
 <string name="status_install_success">Tor\'s binaire bestanden succesvol geïnstalleerd</string>
 <string name="status_install_fail">The binaire bestanden konden niet worden geïnstalleerd. Gelieve het log te raadplegen en tor-assistants@torproject.org op de hoogte te stellen</string>
 <string name="title_error">Toepassingsfout</string>
 <string name="wizard_title">Welkom bij Orbot</string>
 <string name="wizard_btn_tell_me_more">Over Orbot</string>
 <string name="btn_next">Volgende</string>
 <string name="btn_back">Terug</string>
 <string name="btn_finish">Einde</string>
 <string name="btn_okay">OK</string>
 <string name="btn_cancel">Annuleren</string>
 <!-- Welcome Wizard strings (DJH) -->
    <string name="wizard_welcome_msg">Orbot brengt Tor naar de Android. Tor is vrije software en een open netwerk dat u helpt te verdedigen tegen netwerk toezicht welke aanvallen zijn op uw vrijheid en privacy, geheime zakelijke documenten en zaken relaties.
 *WAARSCHUWING:* Door het installeren van Orbot word uw verkeer _niet_ automatisch geproxyt! Deze wizard helpt u hier mee.</string>
    <string name="wizard_details">Enkele Orbot Details</string>
    <string name="wizard_details_msg">Orbot is een open-source applicatie waarin Tor, LibEvent en Privoxy zich bevinden. Het creeërt een lokale HTTP proxy (8118) en een SOCKS proxy (9050) naar het Tor netwerk. Orbot heeft ook de mogelijkheid om al het internet verkeer over het Tor netwerk te sturen.</string>
    <string name="wizard_permissions_root">Toelating toegestaan</string>
    <string name="wizard_permissions_stock">Orbot Rechten</string>
    <string name="wizard_premissions_msg_root">Uitstekend! We hebben gedetecteerd dat je root rechten hebt aangezet voor Orbot. We gebruiken deze kracht met verstand.</string>
    <string name="wizard_permissions_msg_stock">Alhoewel het niet verplicht is kan Orbot ook nog krachtiger worden. Als u root rechten heeft kunt u op de knop onderaan Orbot super krachten toewijzen.</string>
    <string name="wizard_permissions_no_root">Als u niet over root toegang beschikt en geen idee hebt waar u mee bezig bent zult u zeker moeten zijn dat de applicaties die u gebruikt geschikt voor Orbot zijn.</string>
    <string name="wizard_permissions_consent">Ik begrijp dit en wil verdergaan zonder root</string>
    <string name="wizard_permission_enable_root">Root toestaan voor Orbot</string>
    <string name="wizard_configure">Torificatie Configureren</string>
    <string name="wizard_configure_msg">Orbot geeft u de mogelijkheid om induvidueel te bepalen welk van uw applicaties over het Tor netwerk gaan.</string> 
    <string name="wizard_configure_all">Proxy alle toepasingen door Tor</string>
    <string name="wizard_configure_select_apps">Selecteer individuele toepasingen voor Tor</string>
    <string name="wizard_tips_tricks">Orbot-beschikbare Apps</string>
    <string name="wizard_tips_msg">We raden u aan om te apps te downloaden welke zich zich automatisch verbinden met Orbot. Klik op de buttons hier beneden om te installeren.</string>
    <string name="wizard_tips_otrchat">OTRCHAT - Veilige instant message programma voor Android</string>
    <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp; voor Orbot</string>
    <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe u uw apps kunt configureren voor Orbot</string>
    <string name="wizard_proxy_help_info">Proxy Instellingen</string>
    <string name="wizard_proxy_help_msg">Als de Android app welke u gebruikt beschikt over een HTTP of SOCKS proxy instelling, dan kunt u het configureren zodat het via Orbot over het Tor netwerk gaat.
 De host instelling is 127.0.0.1 of "localhost". De poort voor SOCS is 9050 en voor HTTP 8118. Gebruik SOCKS4A or SOCKS5 indien nodig.
 U kunt meer leren over het proxyen op Android door naar de FAQ op http://tinyurl.com/proxyandroid te gaan
    </string>
    <string name="wizard_final">Orbot is klaar!</string>
    <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu bent u ook klaar om te gaan!</string>
    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
 <!-- END Welcome Wizard strings (DJH) -->
 	<string name="connect_first_time">U bent succesvol verbonden met het Tor netwerk, maar dit betekent NIET dat u apparaat volledig veilig is. Gebruik te \'Check\' optie vanuit het menu om u browser te testen.
 Bezoek onze website op https://guardianproject.info/apps/orbot of stuuf een email naar help@guardianproject.info voor vragen.</string>
 	<string name="tor_check">Dit opent uw standaard browser naar https://check.torproject.org om te controleren of Orbot succesvol is geconfigureerd om te verbinden met het Tor netwerk.</string>
    <string name="pref_hs_group">Verborgen diensten</string>
    <string name="pref_general_group">General</string>
    <string name="pref_start_boot_title">Start Orbot on Boot</string>
    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
 </resources>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@ -1,122 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Orbot</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">włącz i wyłącz Tor</string>
    <string name="tor_proxy_service_process">torproxyservice</string>
 <string name="status_starting_up">Orbot startuje...</string>
 <string name="status_activated">Podłączony do sieci Tor</string>
 <string name="status_disabled">Orbot wyłączony</string>
 <string name="status_shutting_down">Orbot wyłącza się</string>
 <string name="tor_process_connecting">Tor startuje...</string>
 <string name="tor_process_connecting_step2">Ustawianie sterowania...</string>
 <string name="tor_process_connecting_step3">zakończono.</string>
 <string name="tor_process_connecting_step4">oczekiwanie.</string>
 <string name="not_anonymous_yet">UWAGA: Twoja komunikacja nie jest jeszcze anonimowa! Proszę skonfiguruj aplikacje aby używały serwera proxy HTTP 127.0.0.1:8118 lub SOCKS4A lub SOCKS5 127.0.0.1:9050</string>
 <string name="menu_home">Start</string>
 <string name="menu_browse">Przeglądaj</string>
 <string name="menu_settings">Ustawienia</string>
 <string name="menu_log">Logi</string>
 <string name="menu_info">Pomoc</string>
 <string name="menu_apps">Aplikacje</string>
 <string name="menu_start">Start</string>
 <string name="menu_stop">Stop</string>
 <string name="button_help">Pomoc</string>
 <string name="button_close">Zamknij</string>
 <string name="button_about">O programie</string>
 <string name="button_clear_log">Czyść dziennik</string>
 <string name="menu_verify">Sprawdź</string>
 <string name="menu_exit">Wyjście</string>
 <string name="powered_by">napędzane oprogramowaniem Projektu Tor</string>
 <string name="press_to_start">- wciśnij, by zacząć -</string>
 <string name="pref_trans_proxy_group">Przekierowanie przezroczyste (Wymaga uprawnień administratora)</string>
 <string name="pref_trans_proxy_title">Przekierowanie przezroczyste</string>
 <string name="pref_trans_proxy_summary">Automatyczne toryfikowanie aplikacji</string>
 <string name="pref_transparent_all_title">Przepuść wszystko przez Tora</string>
 <string name="pref_transparent_all_summary">Przekierowanie ruchu wszystkich aplikacji przez Tora</string>
 <string name="status_install_success">Binarki Tora pomyslnie zainstalowane!</string>
 <string name="status_install_fail">Nie można zainstalować plików binarnych Tora. Zajrzyj do dziennika i powiadom tor-assistants@torproject.org</string>
 <string name="title_error">Błąd Aplikacji</string>
 <string name="wizard_title">Witamy w Orbocie</string>
 <string name="wizard_btn_tell_me_more">O Orbocie</string>
 <string name="btn_next">Dalej</string>
 <string name="btn_back">wstecz</string>
 <string name="btn_finish">Koniec</string>
 <string name="btn_okay">OK</string>
 <string name="btn_cancel">Anuluj</string>
 <!-- Welcome Wizard strings (DJH) -->
    <string name="wizard_welcome_msg">Orbot daje Tora Androidowi. Tor jest otwartym oprogramowaniem i otwartą siecią, która pomaga bronić się przed podsłuchem sieci znanym jako analiza ruchu, który zagraża wolności osobistej i prywatności, poufnym działaniom biznesowym i relacjami oraz bezpieczeństwu państwa.\n\n*UWAGA:* Sama instalacja Orbota _nie_ zanonimizuje magicznie Twojego ruchu! Ten kreator pozwoli Ci w pierwszych krokach.</string>
    <string name="wizard_details">Niektóre szczegóły o Orbocie</string>
    <string name="wizard_details_msg">Orbot jest otwartą aplikacją zawierającą Tora, LibEvent i Privoxy. Dostarcza lokalnego pośrednika HTTP (8118) i SOCKS (9050) do sieci Tora. Orbot ma możliwość, na urządzeniu uruchomionym z prawami administratora, wysyłać cały ruch internetowy przez Tora.</string>
    <string name="wizard_permissions_root">Dostęp zezwolony</string>
    <string name="wizard_permissions_stock">Prawa dostepu Orbota</string>
    <string name="wizard_premissions_msg_root">Doskonale! Odkryliśmy, że masz uprawnienia administratora włączone dla Orbota. Będziemy mądrze korzystać z tej władzy.</string>
    <string name="wizard_permissions_msg_stock"> Podczas gdy nie jest to wymagane, Orbot może stać się znacznie potężniejszym narzędziem, gdy masz prawa administratora na swoim urządzeniu. Użyj przycisku poniżej, by dać Orbotowi duży uprawnienia.</string>
    <string name="wizard_permissions_no_root">Jeśli nie masz uprawnień administratora lub nie masz pojęcia, o czym mówimy, używaj aplikacji skonfigurowanych do pracy z Orbotem.</string>
    <string name="wizard_permissions_consent">Rozumiem i chcę kontynuować bez uprawnień administratora</string>
    <string name="wizard_permission_enable_root">Daj uprawnienia administratora Orbotowi</string>
    <string name="wizard_configure">Skonfiguruj Toryfikację</string>
    <string name="wizard_configure_msg">Orbot daje Ci możliwość przekierowania całego ruchu aplikacji przez Tora ALBO wybrania aplikacji pojedynczo.</string> 
    <string name="wizard_configure_all">Przekierowuj wszystkie aplikacje przez Tora</string>
    <string name="wizard_configure_select_apps">Wybierz poszczególne aplikacje dla Tora</string>
    <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string>
    <string name="wizard_tips_msg">Zachęcamy do pobierania i używania aplikacji, które wiedzą, jak łączyć się bezpośrednio z Orbotem. Kliknij na poniższe przyciski, by zainstalować.</string>
    <string name="wizard_tips_otrchat">OTRCHAT - Bezpieczny klieny rozmów dla Androida</string>
    <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</string>
    <string name="wizard_tips_proxy">Ustawienia Proxy - NDowiedz się, jak konfiguroać aplikacje do współpracy z Orbotem</string>
    <string name="wizard_proxy_help_info">Ustawienia Proxy</string>
    <string name="wizard_proxy_help_msg">Jeśli aplikacja na Androida, której używasz ma obsługę proxy HTTP lub SOCKS, możesz skonfigurować ją do łączenia się z Orbotem i używania Tora.\n\n
    Ustawienie hosta to 127.0.0.1 lub "localhost". Dla HTTP, numer portu to 8118. Dla SOCKS pośrednik to 9050. Powinno się używać SOCKS4A lub SOCKS5, jeśli to możliwe.
    \n\n
    Możesz dowiedzieć się więcej o przekierowaniu ruchu na Androidzie z FAQ pod adresem: http://tinyurl.com/proxyandroid
    </string>
    <string name="wizard_final">Orbot jest gotowy!</string>
    <string name="wizard_final_msg">Setki tysięcy ludzi na całym świecie używają Tora z różnych powodów: dziennikarze i blogerzy, działacze na rzecz praw człowieka, stróże prawa, żołnierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string>
    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
 <!-- END Welcome Wizard strings (DJH) -->
 	<string name="connect_first_time">Pomyślnie połaczono z siecią Tora - ale to NIE oznacza, że Twoje urządzenie jest bezpieczne. Możesz użyć opcji \'Sprawdź\' w menu, aby przetestować swoją przeglądarkę. \n\nOdwiedź nas na https://guardianproject.info/apps/orbot lub wyślij email na help@guardianproject.info, by dowiedzieć się więcej.</string>
 	<string name="tor_check">To otworzy Twoją domyślną przeglądarkę na adresie https://check.torproject.org w celu sprawdzenia, czy Orbot jest skonfigurowany i jest poąłczenie z Torem.</string>
    <string name="pref_hs_group">Usługi ukryte</string>
    <string name="pref_general_group">General</string>
    <string name="pref_start_boot_title">Start Orbot on Boot</string>
    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
 </resources>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@ -1,41 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Orbot</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">iniciar e parar Tor</string>
    <string name="tor_proxy_service_process">torproxyservice</string>
 <string name="status_starting_up">O Orbot está a iniciar...</string>
 <string name="status_activated">Ligação estabelecida à rede Tor</string>
 <string name="status_disabled">"Orbot está Desactivado</string>
 <string name="status_shutting_down">Orbot a encerrar</string>
 <string name="tor_process_connecting">A iniciar Tor...</string>
 <string name="tor_process_connecting_step2">a autenticar a ligação de controlo...</string>
 <string name="tor_process_connecting_step3">completo.</string>
 <string name="tor_process_connecting_step4">a aguardar.</string>
 <string name="not_anonymous_yet">ATENÇÃO: A sua ligação ainda não é anónima! Por favor configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
 <string name="menu_home">Início</string>
 <string name="menu_browse">Explorar</string>
 <string name="menu_settings">Definições</string>
 <string name="menu_log">Relatório</string>
 <string name="menu_info">Ajuda</string>
 <string name="menu_apps">Aplicações</string>
 <string name="menu_start">Iniciar</string>
 <string name="menu_stop">Parar</string>
 <string name="button_help">Ajuda</string>
 <string name="button_close">Encerrar</string>
 <string name="button_about">Sobre</string>
 <string name="menu_verify">Check</string>
 <string name="menu_exit">Exit</string>
 </resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@ -1,122 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Orbot</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">запуск и остановка Tor</string>
    <string name="tor_proxy_service_process">torproxyservice</string>
 <string name="status_starting_up">Запуск Orbot...</string>
 <string name="status_activated">Подключен к сети Tor</string>
 <string name="status_disabled">"Orbot Отключен</string>
 <string name="status_shutting_down">Orbot выключается</string>
 <string name="tor_process_connecting">Запуск Tor...</string>
 <string name="tor_process_connecting_step2">Настройка управления...</string>
 <string name="tor_process_connecting_step3">готово.</string>
 <string name="tor_process_connecting_step4">ожидание.</string>
 <string name="not_anonymous_yet">ВНИМАНИЕ! Ваш поток данных еще не анонимен! Пожалуйста, настройте свои приложения на использование HTTP прокси 127.0.0.1:8118 или SOCKS4A или SOCKS5 прокси 127.0.0.1:9050</string>
 <string name="menu_home">Домашняя страница</string>
 <string name="menu_browse">Просмотр</string>
 <string name="menu_settings">Параметры</string>
 <string name="menu_log">Журнал</string>
 <string name="menu_info">Справка</string>
 <string name="menu_apps">Приложения</string>
 <string name="menu_start">Запустить</string>
 <string name="menu_stop">Остановить</string>
 <string name="button_help">Справка</string>
 <string name="button_close">Закрыть</string>
 <string name="button_about">О программе</string>
 <string name="button_clear_log">Очистить журнал</string>
 <string name="menu_verify">Проверка</string>
 <string name="menu_exit">Выход</string>
 <string name="powered_by">powered by the Tor Project</string>
 <string name="press_to_start">- нажмите на пуск -</string>
 <string name="pref_trans_proxy_group">Прозрачный прокси (Требуются привилегии root)</string>
 <string name="pref_trans_proxy_title">Прозрачный прокси</string>
 <string name="pref_trans_proxy_summary">Автоматическая торификация приложений</string>
 <string name="pref_transparent_all_title">Направлять все через Tor</string>
 <string name="pref_transparent_all_summary">Трафик всех приложений будет проходить через Tor</string>
 <string name="status_install_success">Программа Tor успешно установлена!</string>
 <string name="status_install_fail">Не удалось установить программу Tor. Пожалуйста, проверьте системный журнал и сообщите нам: tor-assistants@torproject.org</string>
 <string name="title_error">Ошибка приложения</string>
 <string name="wizard_title">Добро пожаловать в Orbot</string>
 <string name="wizard_btn_tell_me_more">Об Orbot</string>
 <string name="btn_next">Вперед</string>
 <string name="btn_back">Назад</string>
 <string name="btn_finish">Завершить</string>
 <string name="btn_okay">Ok</string>
 <string name="btn_cancel">Отмена</string>
 <!-- Welcome Wizard strings (DJH) -->
    <string name="wizard_welcome_msg">Orbot, и Tor на Android. Tor - это бесплатное программное обеспечение и открытая сеть, которая позволяет вам сберечься от прослушивания в сети, которое угрожает вашей свободе и конфиденциальности в бизнесе, отношениях, Tor позволяет защититься от анализа трафика.\n\n*ВНИМАНИЕ:* Установка Orbot не может магическим образом анонимизировать весь ваш мобильный трафик! Этот мастер поможет вам начать.</string>
    <string name="wizard_details">Некоторые сведенья о программе Orbot</string>
    <string name="wizard_details_msg">Orbot - это приложение с открытым кодом, которое содержит Tor, LibEvent и Privoxy. Она обеспечивает работу локального HTTP прокси (8118) и SOCKS прокси (9050) в сети Tor. Orbot также позволяет, из корня устройсва, пересылать весь интернет трафик через Tor.</string>
    <string name="wizard_permissions_root">Разрешение получено</string>
    <string name="wizard_permissions_stock">Разрешения Orbot</string>
    <string name="wizard_premissions_msg_root">Отлично! Мы определили, что доступ к корневому каталогу  в Orbot разрешен. Мы будем использовать это с умом.</string>
    <string name="wizard_permissions_msg_stock">Хотя это не требуется, Orbot может быть более мощным инструментом, если доступ к корневому каталогу устройства разрешен. Нажимите на кнопку ниже и дайте Orbot суперсилу!</string>
    <string name="wizard_permissions_no_root">Если у вас нет доступа к корневому каталогу или вы понятия не имеете о чем мы говорим, просто убедитесь, что используете приложения, разработанные для Orbot.</string>
    <string name="wizard_permissions_consent">Я все понял, продолжу без доступа к корню</string>
    <string name="wizard_permission_enable_root">Дать доступ к корю программе Orbot</string>
    <string name="wizard_configure">Настроить Торификацию</string>
    <string name="wizard_configure_msg">Программа Orbot дает вам возможность маршрутизировать трафик всех приложений через Tor ИЛИ выбрать приложения для маршрутизации самостоятельно.</string> 
    <string name="wizard_configure_all">Маршрутизировать все приложения через Tor</string>
    <string name="wizard_configure_select_apps">Выберите приложения для маршрутизации через Tor</string>
    <string name="wizard_tips_tricks">Orbot-задействованные приложения</string>
    <string name="wizard_tips_msg">Мы советуем вам скачать и использовать приложения, которые умеют работать напрямую через Orbot. Нажмите на кнопки ниже, чтобы запустить процесс установки.</string>
    <string name="wizard_tips_otrchat">OTRCHAT - Обезопасте обмен мгновенными сообщениями для клиентов в Android</string>
    <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string>
    <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string>
    <string name="wizard_proxy_help_info">Настройки Прокси</string>
    <string name="wizard_proxy_help_msg">Если используемое вами приложение для Android поддерживает HTTP или SOCKS, то вы можете настоить его на подключение к Orbot и использование Tor.\n\n
    Настройки хоста (или localhost) - 127.0.0.1. Для HTTP, номер порта - 8118. Для SOCKS прокси - 9050. По возможности используйте SOCKS4A или SOCKS5.
    \n\n
    Вы можете узнать больше о работе через прокси на Android, прочитав этот FAQ: http://tinyurl.com/proxyandroid
    </string>
    <string name="wizard_final">Программа Orbot готова к использованию!</string>
    <string name="wizard_final_msg">Сотни тысяч людей по всему миру используют Tor по различным причинам: журналисты и блоггеры, активисты организаций, выступающих в защиту прав человека, судебные исполнители, солдаты, корпорации, граждане стран с репрессивным режимом, и простые люди... а теперь готовы и вы!</string>
    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
 <!-- END Welcome Wizard strings (DJH) -->
 	<string name="connect_first_time"> Вы успешно подключились к сети Tor, но это НЕ значит, что ваше устройство безопасно. Вы можете воспользоваться функцией \'Проверки\' из меню, чтобы потестировать ваш браузер. \n\nПосетите наш сайт: https://guardianproject.info/apps/orbot или отправьте нам письмо на адрес: help@guardianproject.info, чтобы узнать больше.</string>
 	<string name="tor_check">Это приведет к запуску веб-браузера, выбранного на вашем компьютере по-умолчанию, и подключению к сайту https://check.torproject.org, с целью проверки правильности работы Orbot и определения, подключены ли вы к сети Tor.</string>
    <string name="pref_hs_group">Скрытые сервисы</string>
    <string name="pref_general_group">General</string>
    <string name="pref_start_boot_title">Start Orbot on Boot</string>
    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
 </resources>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@ -1,38 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Orbot</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">start and stop Tor</string>
    <string name="tor_proxy_service_process">torproxyservice</string>
 <string name="status_starting_up">Orbot startar...</string>
 <string name="status_activated">Uppkopplad till Tor nätverket</string>
 <string name="status_disabled">"Orbot är inaktiverad</string>
 <string name="status_shutting_down">Orbot avslutas</string>
 <string name="tor_process_connecting">Startar Tor...</string>
 <string name="tor_process_connecting_step2">verifierar kontroll uppkopplingen...</string>
 <string name="tor_process_connecting_step3">klar.</string>
 <string name="tor_process_connecting_step4">väntar.</string>
 <string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina apps att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string>
 <string name="menu_home">Hem</string>
 <string name="menu_browse">Browse</string>
 <string name="menu_settings">Inställningar</string>
 <string name="menu_log">Logg</string>
 <string name="menu_info">Hjälp</string>
 <string name="menu_apps">Apps</string>
 <string name="menu_start">Start</string>
 <string name="menu_stop">Stopp</string>
 <string name="button_help">Hjälp</string>
 <string name="button_close">Stäng</string>
 <string name="button_about">Om</string>
 </resources>
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@ -1,127 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Orbot</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">启动和停止Tor</string>
    <string name="tor_proxy_service_process">Tor代理服务</string>
 <string name="status_starting_up">Orbot正在启动...</string>
 <string name="status_activated">已经连接上了Tor网络</string>
 <string name="status_disabled">Orbot已停用</string>
 <string name="status_shutting_down">Orbot正在关闭</string>
 <string name="tor_process_connecting">正在启动Tor....</string>
 <string name="tor_process_connecting_step2">启动控制连接...</string>
 <string name="tor_process_connecting_step3">完毕.</string>
 <string name="tor_process_connecting_step4">请等待...</string>
 <string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器127.0.0.1:8118或者SOCKS4A或者SOCKS5代理服务器127.0.0.1:9050</string>
 <string name="menu_home">首页</string>
 <string name="menu_browse">浏览</string>
 <string name="menu_settings">设置</string>
 <string name="menu_log">日志</string>
 <string name="menu_info">帮助</string>
 <string name="menu_apps">应用</string>
 <string name="menu_start">启动</string>
 <string name="menu_stop">停止</string>
 <string name="button_help">帮助</string>
 <string name="button_close">关闭</string>
 <string name="button_about">关于</string>
 <string name="button_clear_log">清除日志</string>
 <string name="menu_verify">验证</string>
 <string name="menu_exit">退出</string>
 <string name="powered_by">由 Tor 项目提供动力</string>
 <string name="press_to_start">- 按下后启动 -</string>
 <string name="pref_trans_proxy_group">透明代理(需要 Root 权限)</string>
 <string name="pref_trans_proxy_title">透明代理</string>
 <string name="pref_trans_proxy_summary">应用程序自动通过 Tor 访问网络</string>
 <string name="pref_transparent_all_title">全局使用 Tor</string>
 <string name="pref_transparent_all_summary">所有应用程序均通过 Tor 访问网络</string>
 <string name="status_install_success">Tor 程序安装成功！</string>
 <string name="status_install_fail">Tor 程序安装失败，请检查日志并报告给 tor-assistants@torproject.org</string>
 <string name="title_error">应用程序错误</string>
 <string name="wizard_title">欢迎使用 Orbot</string>
 <string name="wizard_btn_tell_me_more">关于 Orbot</string>
 <string name="btn_next">前进</string>
 <string name="btn_back">后退</string>
 <string name="btn_finish">完成</string>
 <string name="btn_okay">确定</string>
 <string name="btn_cancel">取消</string>
 <!-- Welcome Wizard strings (DJH) -->
    <string name="wizard_welcome_msg">Orbot 把 Tor 带到 Android 中。Tor 是一个自由软件，也是一个开放的网络。它可以帮助你防御可能威胁到人身自由和隐私，秘密的商业活动和商业关系，国家安全网络监控 - 流量分析。
 警告：* 仅仅是安装上 Orbot 并不能神奇地使你的移动网络流量变得无迹可寻！下面的向导将会引领你的匿名之路。</string>
    <string name="wizard_details">关于 Orbot 的详情</string>
    <string name="wizard_details_msg">Orbot 是一个开放源代码的应用程序，它包含了 Tor, LibEvent 和 Privoxy. 它在本地提供一个连接到 Tor 网络的 HTTP 代理（8118）和一个 SOCKS 代理（9050）。在有 Root 权限的设备上，Orbot 能够让所有的互联网访问通过 Tor 网络发出。</string>
    <string name="wizard_permissions_root">已经获得授权</string>
    <string name="wizard_permissions_stock">Orbot 权限</string>
    <string name="wizard_premissions_msg_root">很好！我们检测到 Orbot 已经获得了 Root 权限。我们会谨慎地使用它。</string>
    <string name="wizard_permissions_msg_stock">虽然 Root 权限并不是必须的，但是一旦拥有，Orbot 就会变成更加强大的工具。点击下面的按钮获得 Root 权限！</string>
    <string name="wizard_permissions_no_root">如果你没有 Root 权限，或者不明白我们在说什么，请一定只使用那些支持 Orbot的应用程序。</string>
    <string name="wizard_permissions_consent">我知道我没有 Root 权限，继续</string>
    <string name="wizard_permission_enable_root">授予 Orbot Root 权限</string>
    <string name="wizard_configure">配置 Tor 功能</string>
    <string name="wizard_configure_msg">Orbot 允许你选择代理所有的应用程序或者只代理某几个选中 的应用程序</string> 
    <string name="wizard_configure_all">使用 Tor 代理所有的应用程序</string>
    <string name="wizard_configure_select_apps">选择要使用 Tor 的应用程序</string>
    <string name="wizard_tips_tricks">支持 Orbot 的应用程序</string>
    <string name="wizard_tips_msg">我们鼓励你下载并使用能直接连接到 Orbot 的应用程序。点击下面的按钮来安装。</string>
    <string name="wizard_tips_otrchat">OTRCHAT - Android 上的安全的即时聊天客户端</string>
    <string name="wizard_tips_orweb">ORWEB (仅限 Android 1.x) - 通过 Orbot 保护隐私而设计的浏览器</string>
    <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
    <string name="wizard_proxy_help_info">代理设置</string>
    <string name="wizard_proxy_help_msg">如果你的 Android 程序能支持 HTTP 或者 SOCKS 代码，那么你可配置它们连接到 Orbot 以便使用 Tor。
 主机地址是 127.0.0.1 或者 localhost, HTTP 代理端口是 8118, SOCKS 代理端口是 9050. 你可以使用 SOCKS4A 或者 SOCKS5. 
 获取更多关于 Android 上使用代理设置的信息请访问： http://tinyurl.com/proxyandroid
    </string>
    <string name="wizard_final">Orbot 配置完成</string>
    <string name="wizard_final_msg">全世界有100多万的人由于各种原因正在使用 Tor：新闻记者，博客，人权工作者，法律援助者，士兵，公司，强权政制下的公民，和普通的公民...现在你也一样在使用 Tor 了！</string>
    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
 <!-- END Welcome Wizard strings (DJH) -->
 	<string name="connect_first_time">你已经成功连接到Tor网络-但是，这并不意味着你的设备是安全的。你可以使用菜单中的\'检查\'选项来测试你的浏览器。
 访问我们的网站https://guardianproject.info/apps/orbot或发送电子邮件至help@guardianproject.info了解更多信息。</string>
 	<string name="tor_check">这将打开你的默认浏览器至 https://check.torproject.org 为了确认 Orbot是否安装完成和你是否连接到了Tor。</string>
    <string name="pref_hs_group">隐匿服务</string>
    <string name="pref_general_group">General</string>
    <string name="pref_start_boot_title">Start Orbot on Boot</string>
    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
 </resources>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@ -1,127 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Orbot</string>
        <string name="app_version">1.0.4</string>
    <string name="internal_web_url">http://orbot/</string>
    <string name="default_web_url">http://check.torproject.org</string>
    <string name="secure_default_web_url">https://check.torproject.org</string>
    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
    <string name="control_permission_label">start and stop Tor</string>
    <string name="tor_proxy_service_process">torproxyservice</string>
 <string name="status_starting_up">Orbot is starting...</string>
 <string name="status_activated">Connected to the Tor network</string>
 <string name="status_disabled">"Orbot is Deactivated</string>
 <string name="status_shutting_down">Orbot is shutting down</string>
 <string name="tor_process_connecting">Starting Tor...</string>
 <string name="tor_process_connecting_step2">Setting up control...</string>
 <string name="tor_process_connecting_step3">complete.</string>
 <string name="tor_process_connecting_step4">waiting.</string>
 <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
 <string name="menu_home">Home</string>
 <string name="menu_browse">Browse</string>
 <string name="menu_settings">Settings</string>
 <string name="menu_log">Log</string>
 <string name="menu_info">Help</string>
 <string name="menu_apps">Apps</string>
 <string name="menu_start">Start</string>
 <string name="menu_stop">Stop</string>
 <string name="button_help">Help</string>
 <string name="button_close">Close</string>
 <string name="button_about">About</string>
 <string name="button_clear_log">Clear Log</string>
 <string name="menu_verify">Check</string>
 <string name="menu_exit">Exit</string>
 <string name="powered_by">powered by the Tor Project</string>
 <string name="press_to_start">- press to start -</string>
 <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
 <string name="pref_trans_proxy_title">Transparent Proxying</string>
 <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
 <string name="pref_transparent_all_title">Tor Everything</string>
 <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
 <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
 <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
 <string name="pref_transparent_port_title">Port List</string>
 <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
 <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
 <string name="status_install_success">Tor binaries successfully installed!</string>
 <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants@torproject.org</string>
 <string name="title_error">Application Error</string>
 <string name="wizard_title">Welcome to Orbot</string>
 <string name="wizard_btn_tell_me_more">About Orbot</string>
 <string name="btn_next">Next</string>
 <string name="btn_back">Back</string>
 <string name="btn_finish">Finish</string>
 <string name="btn_okay">Okay</string>
 <string name="btn_cancel">Cancel</string>
 <!-- Welcome Wizard strings (DJH) -->
    <string name="wizard_welcome_msg">Orbot brings Tor to Android. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.\n\n*WARNING:* Simply installing Orbot will _not_ magically anonymize your mobile traffic! This wizard will help you get started.</string>
    <string name="wizard_details">Some Orbot Details</string>
    <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
    <string name="wizard_permissions_root">Permission Granted</string>
    <string name="wizard_permissions_stock">Orbot Permissions</string>
    <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
    <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
    <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
    <string name="wizard_permissions_consent">I understand and would like to continue without root</string>
    <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
    <string name="wizard_configure">Configure Torification</string>
    <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> 
    <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
    <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
    <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
    <string name="wizard_tips_msg">We encourage you to download &amp; use apps that know how to connect directly to Orbot. Click on the buttons below to install.</string>
    <string name="wizard_tips_otrchat">OTRCHAT - Secure instant messaging client for Android</string>
    <string name="wizard_tips_orweb">ORWEB (Android 1.x Only) - Browser designed for privacy &amp; for Orbot</string>
    <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
    <string name="wizard_proxy_help_info">Proxy Settings</string>
    <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n
    The host settings is 127.0.0.1 or "localhost". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.
    \n\n
    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
    </string>
    <string name="wizard_final">Orbot is ready!</string>
    <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
 <!-- END Welcome Wizard strings (DJH) -->
 	<string name="connect_first_time"> You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@guardianproject.info to learn more.</string>
 	<string name="tor_check">This will open your default web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
    <string name="pref_hs_group">Hidden Services</string>
    <string name="pref_general_group">General</string>
    <string name="pref_start_boot_title">Start Orbot on Boot</string>
    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
 </resources>
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@ -1,119 +0,0 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 <PreferenceCategory android:title="@string/pref_general_group">
 <CheckBoxPreference 
 android:defaultValue="true" 
 android:key="pref_start_boot"
 android:title="@string/pref_start_boot_title"
 android:summary="@string/pref_start_boot_summary"
 android:enabled="true"/>
 </PreferenceCategory>
 <PreferenceCategory android:title="@string/pref_trans_proxy_group">
 <CheckBoxPreference 
 android:defaultValue="false" 
 android:key="pref_transparent"
 android:title="@string/pref_trans_proxy_title"
 android:summary="@string/pref_trans_proxy_summary"
 android:enabled="true"/>
 <CheckBoxPreference
 android:defaultValue="false" 
 android:key="pref_transparent_all"
 android:summary="@string/pref_transparent_all_summary"
 android:enabled="true" 
 android:title="@string/pref_transparent_all_title"/>
 <Preference
 android:defaultValue="" 
 android:key="pref_transparent_app_list"
 android:title="Select Apps"
 android:summary="Choose Apps to Route Through Tor"
 android:enabled="true"/>
 <CheckBoxPreference
 android:defaultValue="false" 
 android:key="pref_transparent_port_fallback"
 android:summary="@string/pref_transparent_port_fallback_summary"
 android:enabled="true" 
 android:title="@string/pref_transparent_port_fallback_title"/>
 <EditTextPreference android:key="pref_port_list"
 android:defaultValue="80,443,8080,8888,8443"
 android:title="@string/pref_transparent_port_title"
 android:summary="@string/pref_transparent_port_summary"
 android:dialogTitle="@string/pref_transparent_port_dialog"
 />
 </PreferenceCategory>
 <PreferenceCategory android:title="Bridges">
 <CheckBoxPreference android:defaultValue="false" 
 android:title="Use Bridges" android:key="pref_bridges_enabled" 
 android:summary="Enable alternate entrance nodes into the Tor Network"></CheckBoxPreference>
 <!-- 5/8/2010 NF: Arma says this doesn't actually work, so commenting out for now
 <CheckBoxPreference android:defaultValue="false" 
 android:title="Update from Authority" android:key="pref_bridges_update" 
 android:summary="Modify bridge list automatically"></CheckBoxPreference>
 -->
 <EditTextPreference android:key="pref_bridges_list"
 android:title="Bridges"
 android:summary="IP address and port of bridges"
 android:dialogTitle="Enter Bridge Addresses"
 />
 </PreferenceCategory>
 <PreferenceCategory android:title="Relays">
 <CheckBoxPreference android:key="pref_or"
 android:defaultValue="false"
 android:title="Relaying"
 android:summary="Enable your device to be a non-exit relay"
 android:enabled="true"
 />
 <EditTextPreference android:key="pref_or_port"
 android:defaultValue="9001"
 android:title="Relay Port"
 android:summary="Listening port for your Tor relay"
 android:dialogTitle="Enter OR port"
 />
 <EditTextPreference android:key="pref_or_nickname"
 android:defaultValue="Orbot"
 android:title="Relay nickname"
 android:summary="The nickname for your Tor relay"
 android:dialogTitle="Enter a custom relay nickname"
 />
 </PreferenceCategory>
 <PreferenceCategory android:title="ReachableAddresses">
 <CheckBoxPreference
 android:key="pref_reachable_addresses"
 android:defaultValue="false"
 android:title="ReachableAddresses"
 android:summary="Run as a client behind a firewall with restrictive policies"
 android:enabled="true"></CheckBoxPreference>
 <EditTextPreference
 android:key="pref_reachable_addresses_ports"
 android:defaultValue="*:80,*:443"
 android:title="Reachable ports"
 android:summary="Ports reachable behind a restrictive firewall"
 android:dialogTitle="Enter ports"
 />
 </PreferenceCategory>
 <PreferenceCategory android:title="@string/pref_hs_group"><CheckBoxPreference android:title="Enable Hidden Services" android:summary="run servers accessible via the Tor network" android:key="pref_hs_enable"></CheckBoxPreference>
 <EditTextPreference android:summary="enter localhost ports for hidden services" android:title="Hidden Service Ports" android:enabled="false" android:key="pref_hs_ports"></EditTextPreference>
 <EditTextPreference android:key="pref_hs_hostname" android:summary="the addressable name for your hidden service (generated automatically)" android:title=".Onion Hostname"></EditTextPreference>
 </PreferenceCategory>
 </PreferenceScreen>
--- a/sampletorapp/.gitignore
+++ b/sampletorapp/.gitignore
@ -0,0 +1 @@
 /build
--- a/sampletorapp/build.gradle
+++ b/sampletorapp/build.gradle
@ -0,0 +1,62 @@
 apply plugin: 'com.android.application'
 android {
    compileSdkVersion 27
    defaultConfig {
        applicationId "org.torproject.android.sample"
        minSdkVersion 16
        targetSdkVersion 27
        versionCode 1
        versionName "1.0"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
    splits {
        // Configures multiple APKs based on ABI. This helps keep the size down, since PT binaries can be large.
        abi {
            // Enables building multiple APKs per ABI.
            enable true
            // By default all ABIs are included, so use reset() and include to specify that we only
            // want APKs for x86 and x86_64.
            // Resets the list of ABIs that Gradle should create APKs for to none.
            reset()
            // Specifies a list of ABIs that Gradle should create APKs for.
            include "x86", "armeabi", "armeabi-v7a"
            // Specifies that we do not want to also generate a universal APK that includes all ABIs.
            universalApk true
        }
    }
 }
 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation 'com.android.support:appcompat-v7:27.1.1'
    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'com.android.support.test:runner:1.0.2'
    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
    implementation project(':tor-android-binary')
 }
--- a/sampletorapp/proguard-rules.pro
+++ b/sampletorapp/proguard-rules.pro
@ -0,0 +1,21 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
 # proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
 #-keepattributes SourceFile,LineNumberTable
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--- a/sampletorapp/src/androidTest/java/org/torproject/android/sample/ExampleInstrumentedTest.java
+++ b/sampletorapp/src/androidTest/java/org/torproject/android/sample/ExampleInstrumentedTest.java
@ -0,0 +1,26 @@
 package org.torproject.android.sample;
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
 /**
 * Instrumented test, which will execute on an Android device.
 *
 * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
 */
@RunWith(AndroidJUnit4.class)
 public class ExampleInstrumentedTest {
    @Test
    public void useAppContext() {
        // Context of the app under test.
        Context appContext = InstrumentationRegistry.getTargetContext();
        assertEquals("org.torproject.android.sample", appContext.getPackageName());
    }
 }
--- a/sampletorapp/src/main/AndroidManifest.xml
+++ b/sampletorapp/src/main/AndroidManifest.xml
@ -0,0 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="org.torproject.android.sample">
    <application
        android:allowBackup="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/AppTheme">
        <activity android:name=".sampleTorActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
    </application>
 </manifest>
--- a/Show More
+++ b/Show More
		`@ -1 +0,0 @@`
			`org.eclipse.wst.jsdt.launching.baseBrowserLibrary`
		`@ -0,0 +1 @@`
							`Subproject commit 90ae4c5013032158bafad41279823d90eec4d206`
		`@ -0,0 +1 @@`
							`Subproject commit e71ebf275da66dfd601c92e0e80a35114c32f6f8`
		`@ -0,0 +1 @@`
							`Subproject commit da95b91355248ad8f3a6aa6733cc6d24915f59ce`
		`@ -0,0 +1 @@`
							`Subproject commit 3d566cd519017eee1a400e7961ff14058dfaf33c`
		`@ -0,0 +1 @@`
							`Subproject commit f4340f46b2387bc8de7d5320c0b83bb1499933ad`