updating project files, including re-enabling onBoot mode for Orbot service

svn:r24716
updating strings, layouts and drawables. removing unneeded busybox binary.
2011-05-03 05:58:58 +00:00 · 2011-05-03 05:58:19 +00:00 · 2011-05-03 05:56:40 +00:00 · 2011-05-03 05:56:04 +00:00 · 2011-05-03 05:54:24 +00:00 · 2011-05-02 16:11:38 +00:00
169 changed files with 9347 additions and 212101 deletions
--- a/.classpath
+++ b/.classpath
@ -0,0 +1,8 @@
+<?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/jtorctrl.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
--- a/.gitignore
+++ b/.gitignore
@ -1,68 +0,0 @@
-# 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
@ -1,20 +0,0 @@
-[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,16 +5,6 @@
 	<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>
@ -40,40 +30,10 @@
 			<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
@ -0,0 +1,11 @@
+<?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
@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@ -0,0 +1 @@
+Window
--- a/13
+++ b/13
@ -27,18 +27,7 @@ provided guidance in the entire effort.

 Adam Langley made the original valiant effort to port Tor to Android.

-Sathyanarayanan <gsathya@torproject.org> created a patch for the wizard
+Sathyanarayanan <gsathya.ceg@gmail.com> 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
@ -0,0 +1,61 @@
+<?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.22-orbot-alpha-1.0.5.20110503a-dev" 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:enabled="true"
+    		android:name=".service.TorService" 
+    		android:exported="false"
+    		>
+	            <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.debug
+++ b/AndroidManifest.xml.debug
@ -0,0 +1,60 @@
+<?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
@ -0,0 +1,61 @@
+<?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.22-orbot-alpha-1.0.5.20110416a-dev" 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="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:enabled="true"
+    		android:name=".service.TorService" 
+    		android:exported="false"
+    		>
+	            <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/168
+++ b/168
@ -1,45 +1,163 @@

+// 2011/04/15 this document is a bit out of date. We will be updating to use
+// the standalone cross-compiler that is offered by the Android NDK soon
+
 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
+source. It covers building on Debian Lenny (5.0.3).

 Please install the following prerequisites (instructions for each follows):
 	ant: http://ant.apache.org/
-	Android Native Dev Kit or NDK (for C/C++ code):
-        http://developer.android.com/sdk/ndk/index.html
-	Android Software Dev Kit or SDK (for Java code):
-        http://developer.android.com/sdk/index.html
-	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
+	Android OS SDK: http://source.android.com/download
+	droid-wrapper: http://github.com/tmurakam/droid-wrapper
+	libevent source (1.4.12-stable from svn)
+	Tor source (most recent git master branch)
+	Privoxy source (http://sourceforge.net/projects/ijbswa/)

-You will need to run the 'android' command in the SDK to install the necessary
-Android platform supports (ICS 4.x or android-15)
+Install and prepare the Android OS SDK ( http://source.android.com/download )
+on Debian Lenny:

-Be sure that you have all of the git submodules up-to-date:
+	sudo apt-get install git-core gnupg sun-java5-jdk flex bison gperf \
+		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

-	./tor-droid-make.sh fetch
+	curl http://android.git.kernel.org/repo >~/bin/repo
+	chmod a+x ~/bin/repo

-To begin building, from the Orbot root directory, it builds all submodules and
-the project.
+	mkdir ~/mydroid
+	cd ~/mydroid

-        ./tor-droid-make.sh build
+	repo init -u git://android.git.kernel.org/platform/manifest.git
+	repo sync

-Now build the Android app
+	# Paste in key from http://source.android.com/download next...
+	gpg --import

-(gradle / android studio instructions here)
+	cd ~/mydroid

-This will produce an unsigned Tor package APK.
+	# This takes a long while...
+	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/105
+++ b/105
@ -0,0 +1,105 @@
+NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/
+
+1.0.5
+- Added new toolbar notifications and alerts for displaying notifications and Tor messages
+- Removed unused Socks client code from android.net package
+- Updated wizard to show link to Gibberbot (formerly OTRchat) chat app
+- Bundled iptables 1.4.7 for ARM instead of relying on installed version
+- Fixed various issues related to iptables, transproxying for CyanogenMod7/Android 2.3.*
+- Changed how settings changed are processed through the control port (batched instead of one by one)
+- Stopped app by app flushing of iptables rules, in favor of complete flush of 'nat' and 'filter' type
+- removed useless log screen (logs can be viewed/retrieved using 'alogcat' 3rd party app)
+
+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/40
+++ b/40
@ -0,0 +1,40 @@
+
+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.
+
+If you have root access, and a version of Android with iptables that
+supports the netfilter owner module, then Orbot can setup transparent
+proxying for any application.
+
+Finally, Firefox on Android is available, and we have released an
+add-on named ProxyMob for configuring SOCKS proxy settings for use
+with the local Tor socks proxy.
+
+** 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,2011, Nathan Freitas, The Guardian Project
+ * http://guardianproject.info/ */
--- a/64
+++ b/64
@ -41,41 +41,6 @@ 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 includes the Obfs4 pluggable transport:
-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 a binary distribution of Privoxy (http://www.privoxy.org/)
 Copyright © 2001-2010 by Privoxy Developers <ijbswa-developers@lists.sourceforge.net>
@ -193,32 +158,3 @@ 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,28 +1,15 @@

-Tor Android
+Orbot: Android Onion Routing Robot
 ***********************************************
-This is a project forked from Orbot for building the tor binary for Android
+Orbot 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.

-How to Build
 ***********************************************
-Please see: https://raw.githubusercontent.com/n8fr8/tor-android/master/BUILD
-
-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'
-}
-
-
+Orbot is a component of the Guardian Project, an effort to develop
+a secure, anonymous smartphone for use by human rights activists, journalists
+and others around the world. Learn more: http://guardianproject.info/

 ***********************************************
 Tor protects your privacy on the internet by hiding the connection
@ -34,3 +21,7 @@ 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/bcdroid.manifest
+++ b/bcdroid.manifest
@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Sealed: true
+
--- a/build.gradle
+++ b/build.gradle
@ -1,17 +0,0 @@
-// 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
@ -0,0 +1,67 @@
+<?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/default.properties
+++ b/default.properties
@ -4,10 +4,11 @@
 # This file must be checked in Version Control Systems.
 # 
 # To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
+# "build.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-16
-aar.deployPath=/media/n8fr8/nate128/dev/repos/gpmaven/
+target=android-4
+apk-configurations=
--- a/external/Makefile
+++ b/external/Makefile
@ -1,314 +0,0 @@
-# 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
@ -1 +0,0 @@
-Subproject commit 90ae4c5013032158bafad41279823d90eec4d206
--- a/external/libevent-patch-1
+++ b/external/libevent-patch-1
@ -1,29 +0,0 @@
-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
@ -1 +0,0 @@
-Subproject commit e71ebf275da66dfd601c92e0e80a35114c32f6f8
--- a/external/tor
+++ b/external/tor
@ -1 +0,0 @@
-Subproject commit da95b91355248ad8f3a6aa6733cc6d24915f59ce
--- a/external/xz
+++ b/external/xz
@ -1 +0,0 @@
-Subproject commit 3d566cd519017eee1a400e7961ff14058dfaf33c
--- a/external/zstd
+++ b/external/zstd
@ -1 +0,0 @@
-Subproject commit f4340f46b2387bc8de7d5320c0b83bb1499933ad
--- a/gradle.properties
+++ b/gradle.properties
@ -1,17 +0,0 @@
-## 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
@ -1,6 +0,0 @@
-#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
@ -1,172 +0,0 @@
-#!/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
@ -1,84 +0,0 @@
-@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/patches/orbot-patch-sporkbomb-20110501/Part
+++ b/patches/orbot-patch-sporkbomb-20110501/Part
@ -0,0 +1,11 @@
+_______________________________________________
+Guardian-dev mailing list
+
+Post: Guardian-dev@lists.mayfirst.org
+List info: https://lists.mayfirst.org/mailman/listinfo/guardian-dev
+
+To Unsubscribe
+        Send email to:  Guardian-dev-unsubscribe@lists.mayfirst.org
+        Or visit: https://lists.mayfirst.org/mailman/options/guardian-dev/nathan%40guardianproject.info
+
+You are subscribed as: nathan@guardianproject.info
--- a/patches/orbot-patch-sporkbomb-20110501/orbot-real_transproxy_all-use_only_new_iptables.patch
+++ b/patches/orbot-patch-sporkbomb-20110501/orbot-real_transproxy_all-use_only_new_iptables.patch
@ -0,0 +1,390 @@
+Index: src/org/torproject/android/service/TorService.java
+===================================================================
+--- src/org/torproject/android/service/TorService.java	(revision 24697)
+++ src/org/torproject/android/service/TorService.java	(working copy)
+@@ -710,10 +710,36 @@
+ 	
+ 	 		if (enableTransparentProxy)
+ 	 		{
+-				showAlert("Status", "Setting up transparent proxying...");
+-
+-				//TorTransProxy.setDNSProxying();
+-				int code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this),transProxyAll);
+	 			//TODO: Find a nice place for the next (commented) line
+				//TorTransProxy.setDNSProxying(); 
+				
+				int code = 0; // Default state is "okay"
+					
+				if(transProxyPortFallback)
+				{
+					showAlert("Status", "Setting up port-based transparent proxying...");
+					StringTokenizer st = new StringTokenizer(portProxyList, ",");
+					int status = code;
+					while (st.hasMoreTokens())
+					{
+						status = TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken()));
+						if(status != 0)
+							code = status;
+					}
+				}
+				else
+				{
+					if(transProxyAll)
+					{
+						showAlert("Status", "Setting up full transparent proxying...");
+						code = TorTransProxy.setTransparentProxyingAll(this);
+					}
+					else
+					{
+					showAlert("Status", "Setting up app-based transparent proxying...");
+					code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this),transProxyAll);
+					}
+				}
+ 			
+ 				TorService.logMessage ("TorTransProxy resp code: " + code);
+ 				
+@@ -725,17 +751,7 @@
+ 				{
+ 					showAlert("Status", "WARNING: error starting transparent proxying!");
+ 				}
+-				
+-				//this is for Androids w/o owner module support as a circumvention only fallback
+-				if (transProxyPortFallback)
+-				{
+-					StringTokenizer st = new StringTokenizer(portProxyList, ",");
+-					
+-					while (st.hasMoreTokens())
+-						TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken()));
+-					
+-				}
+-				
+			
+ 				return true;
+ 	 				
+ 	 		}
+Index: src/org/torproject/android/service/TorTransProxy.java
+===================================================================
+--- src/org/torproject/android/service/TorTransProxy.java	(revision 24697)
+++ src/org/torproject/android/service/TorTransProxy.java	(working copy)
+@@ -136,8 +136,6 @@
+ 		//redirectDNSResolvConf(); //not working yet
+ 		
+ 		String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath();
+-
+-		boolean ipTablesOld = false;
+ 		
+     	StringBuilder script = new StringBuilder();
+     	
+@@ -145,14 +143,12 @@
+     	int code = -1;
+     	
+     	purgeIptables(context);
+-		
+-		script = new StringBuilder();
+-		
+				
+ 		//build up array of shell cmds to execute under one root context
+ 		for (int i = 0; i < apps.length; i++)
+ 		{
+ 
+-			if (forceAll || apps[i].isTorified()) //if "Tor Everything" on or app is set to true
+			if (apps[i].isTorified()) //if app is set to true
+ 			{
+ 				
+ 				if (apps[i].getUsername().equals(TorServiceConstants.TOR_APP_USERNAME))
+@@ -170,14 +166,8 @@
+ 				script.append(" -m owner --uid-owner ");
+ 				script.append(apps[i].getUid());
+ 				script.append(" -m tcp --syn");
+-				
+-				if (ipTablesOld)
+-					script.append(" -j DNAT --to 127.0.0.1:");
+-				else
+-					script.append(" -j REDIRECT --to-ports ");
+-				
+				script.append(" -j REDIRECT --to-ports ");
+ 				script.append(TOR_TRANSPROXY_PORT);
+-				
+ 				script.append(" || exit\n");
+ 				
+ 				//DNS
+@@ -187,57 +177,37 @@
+ 				script.append(apps[i].getUid());
+ 				script.append(" -m udp --dport "); 
+ 				script.append(STANDARD_DNS_PORT);
+				script.append(" -j REDIRECT --to-ports ");
+				script.append(TOR_DNS_PORT);
+				script.append(" || exit\n");
+ 				
+-				if (ipTablesOld)
+-					script.append(" -j DNAT --to 127.0.0.1:");
+-				else
+-					script.append(" -j REDIRECT --to-ports ");
+				script.append(ipTablesPath);
+				script.append(" -t filter");
+				script.append(" -A OUTPUT -p tcp");
+				script.append(" -m owner --uid-owner ");
+				script.append(apps[i].getUid());
+				script.append(" -m tcp --dport ");
+				script.append(TOR_TRANSPROXY_PORT);
+				script.append(" -j ACCEPT");
+				script.append(" || exit\n");
+ 				
+				script.append(ipTablesPath);
+				script.append(" -t filter");
+				script.append(" -A OUTPUT -p udp");
+				script.append(" -m owner --uid-owner ");
+				script.append(apps[i].getUid());
+				script.append(" -m udp --dport ");
+ 				script.append(TOR_DNS_PORT);
+-				
+				script.append(" -j ACCEPT");
+ 				script.append(" || exit\n");
+									
+				script.append(ipTablesPath);
+				script.append(" -t filter -A OUTPUT -m owner --uid-owner ");
+				script.append(apps[i].getUid());
+				script.append(" -j DROP"); //drop all other packets as Tor won't handle them
+				script.append(" || exit\n");
+ 				
+ 				
+-				if (ipTablesOld) //for some reason this doesn't work on iptables 1.3.7
+-				{
+-					script.append(ipTablesPath);
+-					script.append(" -t nat");
+-					script.append(" -A OUTPUT -m owner --uid-owner ");
+-					script.append(apps[i].getUid());
+-					script.append(" -j DROP"); 
+-					script.append(" || exit\n");
+-				}	
+-				else
+-				{
+-					script.append(ipTablesPath);
+-					script.append(" -t filter");
+-					script.append(" -A OUTPUT -p tcp");
+-					script.append(" -m owner --uid-owner ");
+-					script.append(apps[i].getUid());
+-					script.append(" -m tcp --dport ");
+-					script.append(TOR_TRANSPROXY_PORT);
+-					script.append(" -j ACCEPT");
+-					script.append(" || exit\n");
+-					
+-					script.append(ipTablesPath);
+-					script.append(" -t filter");
+-					script.append(" -A OUTPUT -p udp");
+-					script.append(" -m owner --uid-owner ");
+-					script.append(apps[i].getUid());
+-					script.append(" -m udp --dport ");
+-					script.append(TOR_DNS_PORT);
+-					script.append(" -j ACCEPT");
+-					script.append(" || exit\n");
+-										
+-					script.append(ipTablesPath);
+-					script.append(" -t filter -A OUTPUT -m owner --uid-owner ");
+-					script.append(apps[i].getUid());
+-					script.append(" -j DROP"); //drop all other packets as Tor won't handle them
+-					script.append(" || exit\n");
+-					
+-				}
+-				
+-				
+ 			}		
+ 		}
+ 		
+@@ -260,20 +230,13 @@
+ 		
+ 		//String baseDir = context.getDir("bin",0).getAbsolutePath() + '/';
+ 		String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath();
+-
+-		boolean ipTablesOld = false;
+ 		
+     	StringBuilder script = new StringBuilder();
+     	
+     	StringBuilder res = new StringBuilder();
+     	int code = -1;
+-    	
+-    	String[] cmdFlush = {script.toString()};
+-		code = TorServiceUtils.doShellCommand(cmdFlush, res, true, true);
+-		//String msg = res.toString(); //get stdout from command
+    	purgeIptables(context);
+ 		
+-		script = new StringBuilder();
+-		
+ 		//TCP
+ 		//iptables -t nat -A PREROUTING -i eth0 -p tcp --dport $srcPortNumber -j REDIRECT --to-port $dstPortNumbe
+ 
+@@ -283,14 +246,8 @@
+ 		script.append(" --dport ");
+ 		script.append(port);
+ 		//script.append(" -m tcp --syn");
+-		
+-		if (ipTablesOld)
+-			script.append(" -j DNAT --to 127.0.0.1:");
+-		else
+-			script.append(" -j REDIRECT --to-ports ");
+-		
+		script.append(" -j REDIRECT --to-ports ");
+ 		script.append(TOR_TRANSPROXY_PORT);
+-		
+ 		script.append(" || exit\n");
+ 		
+ 		script.append(ipTablesPath);
+@@ -298,14 +255,8 @@
+ 		script.append(" -A OUTPUT -p udp");
+ 		script.append(" --dport ");
+ 		script.append(port);
+-		
+-		if (ipTablesOld)
+-			script.append(" -j DNAT --to 127.0.0.1:");
+-		else
+-			script.append(" -j REDIRECT --to-ports ");
+-		
+		script.append(" -j REDIRECT --to-ports ");
+ 		script.append(TOR_TRANSPROXY_PORT);
+-		
+ 		script.append(" || exit\n");
+ 		
+ 		//DNS
+@@ -314,24 +265,134 @@
+ 		script.append(" -A OUTPUT -p udp ");
+ 		script.append(" -m udp --dport "); 
+ 		script.append(STANDARD_DNS_PORT);
+		script.append(" -j REDIRECT --to-ports ");
+		script.append(TOR_DNS_PORT);
+		script.append(" || exit\n");
+ 		
+-		if (ipTablesOld)
+-			script.append(" -j DNAT --to 127.0.0.1:");
+-		else
+-			script.append(" -j REDIRECT --to-ports ");
+    	
+    	String[] cmdAdd = {script.toString()};    	
+		code = TorServiceUtils.doShellCommand(cmdAdd, res, true, true);
+		String msg = res.toString();
+		TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg);
+ 		
+		return code;
+    }
+
+	public static int setTransparentProxyingAll(Context context) throws Exception {
+		boolean runRoot = true;
+    	boolean waitFor = true;
+    	
+		//android.os.Debug.waitForDebugger();
+		
+		//redirectDNSResolvConf(); //not working yet
+		
+		String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath();
+		
+    	StringBuilder script = new StringBuilder();
+    	
+    	StringBuilder res = new StringBuilder();
+    	int code = -1;
+    	
+    	purgeIptables(context);
+    	
+    	int torUid = context.getApplicationInfo().uid;
+
+    	// Set up port redirection
+    	script.append(ipTablesPath);
+		script.append(" -t nat");
+		script.append(" -A OUTPUT -p tcp");
+		script.append(" -m owner ! --uid-owner ");
+		script.append(torUid);
+		script.append(" -m tcp --syn");
+		script.append(" -j REDIRECT --to-ports ");
+		script.append(TOR_TRANSPROXY_PORT);
+		script.append(" || exit\n");
+		
+		// Same for DNS
+		script.append(ipTablesPath);
+		script.append(" -t nat");
+		script.append(" -A OUTPUT -p udp -m owner ! --uid-owner ");
+		script.append(torUid);
+		script.append(" -m udp --dport "); 
+		script.append(STANDARD_DNS_PORT);
+		script.append(" -j REDIRECT --to-ports ");
+ 		script.append(TOR_DNS_PORT);
+		script.append(" || exit\n");
+ 		
+		// Allow packets to localhost (contains all the port-redirected ones)
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(" -A OUTPUT");
+		script.append(" -p tcp");
+		script.append(" -d 127.0.0.1");
+		script.append(" -j ACCEPT");
+ 		script.append(" || exit\n");
+ 		
+		// Allow loopback
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(" -A OUTPUT");
+		script.append(" -p tcp");
+		script.append(" -o lo");
+		script.append(" -j ACCEPT");
+		script.append(" || exit\n");
+		
+		// Allow everything for Tor
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(" -A OUTPUT");
+		script.append(" -m owner --uid-owner ");
+		script.append(torUid);
+		script.append(" -j ACCEPT");
+		script.append(" || exit\n");
+		
+		//XXX: Comment the following rules for non-debug builds
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(" -A OUTPUT");
+		script.append(" -p udp");
+		script.append(" --dport ");
+		script.append(STANDARD_DNS_PORT);
+		script.append(" -j LOG");
+		script.append(" --log-prefix='ORBOT_DNSLEAK_PROTECTION'");
+		script.append(" --log-uid");
+		script.append(" || exit\n");
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(" -A OUTPUT");
+		script.append(" -p tcp");
+		script.append(" -j LOG");
+		script.append(" --log-prefix='ORBOT_TCPLEAK_PROTECTION'");
+		script.append(" --log-uid");
+		script.append(" || exit\n");
+		
+		
+		// Reject DNS that is not from Tor (order is important - first matched rule counts!)
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(" -A OUTPUT");
+		script.append(" -p udp");
+		script.append(" --dport ");
+		script.append(STANDARD_DNS_PORT);
+		script.append(" -j REJECT");
+		script.append(" || exit\n");
+		
+		// Reject all other outbound TCP packets
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(" -A OUTPUT");
+		script.append(" -p tcp");
+		script.append(" -j REJECT");
+		script.append(" || exit\n");
+		
+		String[] cmdAdd = {script.toString()};    	
+     	
+-    	String[] cmdAdd = {script.toString()};    	
+-		code = TorServiceUtils.doShellCommand(cmdAdd, res, true, true);
+		code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor);
+ 		String msg = res.toString();
+ 		TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg);
+ 		
+-		return code;
+-    }	
+    	return code;
+	}	
+ 	
+ 
+ }
--- a/patches/orbot-patch-sporkbomb-20110501/orbot_leak_report
+++ b/patches/orbot-patch-sporkbomb-20110501/orbot_leak_report
@ -0,0 +1,110 @@
+<4>[  115.319671] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=9997 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK URGP=0 UID=10035 GID=10035 
+<4>[  115.482788] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=64 TOS=0x00 PREC=0x00 TTL=64 ID=9998 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK URGP=0 UID=10035 GID=10035 
+<4>[  116.037658] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=64 TOS=0x00 PREC=0x00 TTL=64 ID=9999 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK URGP=0 UID=10035 GID=10035 
+<4>[  116.699127] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10000 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10035 GID=10035 
+<4>[  116.724517] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10001 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 UID=10035 GID=10035 
+<4>[  116.922515] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10002 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  117.330810] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10003 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  118.150726] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10004 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  118.903320] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10005 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  119.310729] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10006 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  120.130737] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10007 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  121.770690] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10008 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  122.695465] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10009 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  123.100708] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10010 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  123.920684] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10011 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  125.565673] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10012 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  128.840789] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10013 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  130.366333] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10014 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  130.785339] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10015 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  131.600799] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10016 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  132.835144] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50247 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  133.240753] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10017 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  133.410705] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50248 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  133.443481] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50249 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  134.031341] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50250 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  134.782196] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50251 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  135.360778] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50252 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  136.520782] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10018 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  136.526306] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50253 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  137.334716] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50254 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  137.915832] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50255 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  139.075378] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50256 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  140.435913] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10019 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  140.850799] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10020 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  141.395019] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50257 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  141.675140] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10021 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  142.455352] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50258 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  143.030792] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50259 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  143.310852] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10022 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  144.190734] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50260 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  146.510803] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50261 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  146.590789] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10023 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  151.150726] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50262 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  151.166290] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10024 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  151.570739] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10025 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  152.390686] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10026 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  152.694427] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50263 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  153.270721] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50264 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  154.030731] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10027 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  154.430694] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50265 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  156.750701] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50266 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  157.310699] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10028 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  160.383117] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10029 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  160.790832] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10030 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  161.390716] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50267 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  161.610717] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10031 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  163.250701] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10032 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  166.531494] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10033 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  170.670715] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50268 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  170.842285] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10034 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  171.250732] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10035 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  172.070800] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10036 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  173.309783] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50269 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  173.710784] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10037 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  173.880828] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50270 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  175.040710] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50271 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  176.990692] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10038 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  177.360687] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50272 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  181.682952] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10039 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  182.000701] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50273 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  182.090698] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10040 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  182.910797] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10041 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  184.550689] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10042 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  187.830749] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10043 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  191.280700] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50274 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  193.917053] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10044 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  194.330749] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10045 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  195.150695] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10046 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  196.790679] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10047 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  200.070709] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10048 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  201.567718] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10049 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  201.970703] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10050 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  202.790771] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10051 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  204.430816] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10052 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  207.710693] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10053 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  209.840789] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50275 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  212.362884] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10054 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  212.770812] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10055 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  213.590698] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10056 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  215.235809] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10057 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  217.285766] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50276 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  217.860687] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50277 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  218.510803] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10058 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  219.020721] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50278 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  220.840667] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0 
+<4>[  220.842559] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0 
+<4>[  220.844512] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0 
+<4>[  221.340820] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50279 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  221.478881] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10059 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  221.890777] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10060 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  221.898010] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0 
+<4>[  222.710754] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10061 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  224.350677] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10062 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  225.617523] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0 
+<4>[  225.980743] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50280 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 
+<4>[  227.630798] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10063 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 
+<4>[  241.522155] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=20341 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0 
+<4>[  241.792358] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0 
+<4>[  242.362335] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0 
+<4>[  243.452331] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0 
--- a/patches/update_GibberBot_info/ic_launcher_gibberbot.png
+++ b/patches/update_GibberBot_info/ic_launcher_gibberbot.png
--- a/patches/update_GibberBot_info/update_GibberBot_info.diff
+++ b/patches/update_GibberBot_info/update_GibberBot_info.diff
@ -0,0 +1,285 @@
+Index: res/values-ca/strings.xml
+===================================================================
+--- res/values-ca/strings.xml	(revision 24406)
+++ res/values-ca/strings.xml	(working copy)
+@@ -97,7 +97,7 @@
+     
+     <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string>
+     <string name="wizard_tips_msg">T\'animem a descarregar-te &amp; utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string>
+-    <string name="wizard_tips_otrchat">OTRCHAT - Client de missatgeria instantània segura per a Android</string>
+    <string name="wizard_tips_otrchat">GibberBot - Client de missatgeria instantània segura per a Android</string>
+     <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat &amp; per a Orbot</string>
+     <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string>
+     
+@@ -115,7 +115,7 @@
+     <string name="wizard_final">Orbot és a punt!</string>
+     <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string>
+     
+-    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+ <!-- END Welcome Wizard strings (DJH) -->
+Index: res/drawable/icon_otrchat.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: res/drawable/ic_launcher_gibberbot.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: res/drawable/ic_launcher_gibberbot.png
+___________________________________________________________________
+Added: svn:mime-type
+   + application/octet-stream
+
+Index: res/values-fa/strings.xml
+===================================================================
+--- res/values-fa/strings.xml	(revision 24406)
+++ res/values-fa/strings.xml	(working copy)
+@@ -95,7 +95,7 @@
+     
+     <string name="wizard_tips_tricks">اپلیکیشن هایی که برای اوربات تنظیم شده اند</string>
+     <string name="wizard_tips_msg">توصیه می کنیم داون لود و فعال کنید؛ اپلیکیشن هایی را استفاده کنید که مستقیم به اوربات وصل می شوند. دکمه های زیر را فشار دهید تا نصب شود. </string>
+-    <string name="wizard_tips_otrchat">OTRCHAT - کاربر ایمن انتقال پیام فوری برای آندروید</string>
+    <string name="wizard_tips_otrchat">GibberBot - کاربر ایمن انتقال پیام فوری برای آندروید</string>
+     <string name="wizard_tips_orweb">ORWEB (فقط آندروید 1.x) - مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز اوربات</string>
+     <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با اوربات</string>
+     
+@@ -105,7 +105,7 @@
+     <string name="wizard_final">اوربات آماده استفاده میباشد!</string>
+     <string name="wizard_final_msg">صدها هزار نفر در سراسر جهان به دلایل گوناگون از Tor استفاده می کنند: روزنامه نویسها و بلاگرها، کارکنان حقوق بشر، ماموران انتظامی، سربازان، شرکتها، شهروندان دولتهای سرکوبگر، و شهروندان عادی، و حالا شما نیز آماده استفاده از آن هستید!</string>
+     
+-    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+ <!-- END Welcome Wizard strings (DJH) -->
+Index: res/values-ru/strings.xml
+===================================================================
+--- res/values-ru/strings.xml	(revision 24406)
+++ res/values-ru/strings.xml	(working copy)
+@@ -95,7 +95,7 @@
+     
+     <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_otrchat">GibberBot - Обезопасте обмен мгновенными сообщениями для клиентов в Android</string>
+     <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string>
+     <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string>
+     
+@@ -109,7 +109,7 @@
+     <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="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+ <!-- END Welcome Wizard strings (DJH) -->
+Index: res/values-de/strings.xml
+===================================================================
+--- res/values-de/strings.xml	(revision 24406)
+++ res/values-de/strings.xml	(working copy)
+@@ -97,7 +97,7 @@
+     
+     <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_otrchat">GibberBot - 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-Einstellungen - Lernen Sie Anwendungen so zu konfigurieren, dass sie mit Orbot zusammenarbeiten.</string>
+     
+@@ -115,7 +115,7 @@
+     <string name="wizard_final">Orbot ist bereit!</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.info/getgibber</string>
+    <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+ <!-- END Welcome Wizard strings (DJH) -->
+Index: res/values/strings.xml
+===================================================================
+--- res/values/strings.xml	(revision 24406)
+++ res/values/strings.xml	(working copy)
+@@ -94,7 +94,7 @@
+     
+     <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_otrchat">Gibberbot - 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>
+     
+@@ -108,7 +108,7 @@
+     <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="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+  <!-- END Welcome Wizard strings (DJH) -->
+Index: res/values-ar/strings.xml
+===================================================================
+--- res/values-ar/strings.xml	(revision 24406)
+++ res/values-ar/strings.xml	(working copy)
+@@ -97,7 +97,7 @@
+     
+     <string name="wizard_tips_tricks">تطبيقات مهيئة لأوربوت</string>
+     <string name="wizard_tips_msg">نشجعكم على تحميل واستخدام التطبيقات التي تعرف كيفية الاتصال مباشرة بأوربوت. اضغط على الأزرار في الأسفل للتثبيت.</string>
+-    <string name="wizard_tips_otrchat">OTRCHAT - عميل التراسل الفوري الآمن للأندرويد</string>
+    <string name="wizard_tips_otrchat">GibberBot - عميل التراسل الفوري الآمن للأندرويد</string>
+     <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string>
+     <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string>
+     
+@@ -115,7 +115,7 @@
+     <string name="wizard_final">أوربوت جاهز!</string>
+     <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة: الصحفيين والمدونين، والعاملين في مجال حقوق الإنسان، والجنود والشركات والمواطنين من الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لأن تستخدمه كذلك!</string>
+     
+-    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+ <!-- END Welcome Wizard strings (DJH) -->
+Index: res/values-es/strings.xml
+===================================================================
+--- res/values-es/strings.xml	(revision 24406)
+++ res/values-es/strings.xml	(working copy)
+@@ -97,7 +97,7 @@
+     
+     <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_otrchat">GibberBot - 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>
+     
+@@ -115,7 +115,7 @@
+     <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="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+ <!-- END Welcome Wizard strings (DJH) -->
+Index: res/values-mk/strings.xml
+===================================================================
+--- res/values-mk/strings.xml	(revision 24406)
+++ res/values-mk/strings.xml	(working copy)
+@@ -95,7 +95,7 @@
+     
+     <string name="wizard_tips_tricks">Орбот-вклучени апликации</string>
+     <string name="wizard_tips_msg">Ви препорачуваме да презимате и користите апликации кои што знаат како директно да се поврзат со Орбот. Притиснете на копчињата подолу за инсталирање.</string>
+-    <string name="wizard_tips_otrchat">OTRCHAT - Безбеден клиент за инстант-пораки за Андроид</string>
+    <string name="wizard_tips_otrchat">GibberBot - Безбеден клиент за инстант-пораки за Андроид</string>
+     <string name="wizard_tips_orweb">ORWEB (само Андроид 1.x) - Браусер дизајниран за приватност и за Орбот</string>
+     <string name="wizard_tips_proxy">Подесувања на прокси - Научете како да ги конфигурирате апликациите да работат со Орбот</string>
+     
+@@ -109,7 +109,7 @@
+     <string name="wizard_final">Орбот е спремен!</string>
+     <string name="wizard_final_msg">Стотици илјади луѓе низ целиот Свет го користат Тор од многу различни причини: новинари и блогери, борци за човекови права, полицајци, војници, корпорации, граѓани на репресивни режими, и обични граѓани... а сега и Вие сте спремин да го користите!</string>
+     
+-    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+ <!-- END Welcome Wizard strings (DJH) -->
+Index: res/values-nl/strings.xml
+===================================================================
+--- res/values-nl/strings.xml	(revision 24406)
+++ res/values-nl/strings.xml	(working copy)
+@@ -97,7 +97,7 @@
+     
+     <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_otrchat">GibberBot - 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>
+     
+@@ -114,7 +114,7 @@
+     <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="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+ <!-- END Welcome Wizard strings (DJH) -->
+Index: res/values-pl/strings.xml
+===================================================================
+--- res/values-pl/strings.xml	(revision 24406)
+++ res/values-pl/strings.xml	(working copy)
+@@ -95,7 +95,7 @@
+     
+     <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_otrchat">GibberBot - 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>
+     
+@@ -109,7 +109,7 @@
+     <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="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+ <!-- END Welcome Wizard strings (DJH) -->
+Index: res/layout/layout_wizard_tips.xml
+===================================================================
+--- res/layout/layout_wizard_tips.xml	(revision 24406)
+++ res/layout/layout_wizard_tips.xml	(working copy)
+@@ -17,7 +17,7 @@
+ 		    
+ <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_otrchat"  android:layout_gravity="left" android:drawableLeft="@drawable/ic_launcher_gibberbot"  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"/>
+ 
+Index: res/values-zh/strings.xml
+===================================================================
+--- res/values-zh/strings.xml	(revision 24406)
+++ res/values-zh/strings.xml	(working copy)
+@@ -95,7 +95,7 @@
+     
+     <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_otrchat">GibberBot - Android 上的安全即时消息客户端</string>
+     <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string>
+     <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
+     
+@@ -108,7 +108,7 @@
+     <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="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+     <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+     
+ <!-- END Welcome Wizard strings (DJH) -->
+Index: .classpath
+===================================================================
+--- .classpath	(revision 24406)
+++ .classpath	(working copy)
+@@ -1,9 +1,9 @@
+ <?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="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+ 	<classpathentry kind="output" path="bin"/>
+ </classpath>
--- a/po2xml.sh
+++ b/po2xml.sh
@ -0,0 +1,78 @@
+#!/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="/home/runa/tor/translation/projects/orbot"
+
+# 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="/home/runa/tor/orbot/res"
+
+### 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
+
+	# Validate input and write results to a log file
+	validate_script="/home/runa/tor/translation/tools/validate.py"
+	validate_log="/home/runa/tor/validate/orbot-validate.log"
+	python "$validate_script" -i "$file" -l "$validate_log"
+
+	# 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.
+	dir=`dirname $file | sed "s#$translated/##"`
+	lang=`basename $dir`
+
+	# 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/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_launcher_gibberbot.png
+++ b/res/drawable/ic_launcher_gibberbot.png
--- 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/tornotificationerr.png
+++ b/res/drawable/tornotificationerr.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
@ -0,0 +1,76 @@
+<?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
@ -0,0 +1,113 @@
+<?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" />	
+			<TextView android:text="Privoxy v3.0.12: http://www.privoxy.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="Iptables v1.4.7: http://www.netfilter.org"
+				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
@ -0,0 +1,9 @@
+<?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
@ -0,0 +1,16 @@
+<?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
@ -0,0 +1,20 @@
+<?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
@ -0,0 +1,53 @@
+<?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
@ -0,0 +1,78 @@
+<?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"
+    android:id="@+id/viewMain"
+    >
+    
+    	<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="330px"
+							android:height="75px"
+							android:textColor="#ffffff"
+							 />
+					</TableRow>
+				</TableLayout>
+			</TableRow>
+			
+		</TableLayout>
+	</ScrollView>
+
+
+       
+</LinearLayout>
+
+
--- a/res/layout/layout_settings.xml
+++ b/res/layout/layout_settings.xml
@ -0,0 +1,29 @@
+<?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
@ -0,0 +1,22 @@
+<?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
@ -0,0 +1,24 @@
+<?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
@ -0,0 +1,29 @@
+<?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
@ -0,0 +1,31 @@
+<?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
@ -0,0 +1,29 @@
+<?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/ic_launcher_gibberbot"  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
@ -0,0 +1,24 @@
+<?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/raw/iptables_g1
+++ b/res/raw/iptables_g1
--- a/res/raw/iptables_n1
+++ b/res/raw/iptables_n1
--- a/res/raw/privoxy
+++ b/res/raw/privoxy
--- a/res/raw/privoxy_config
+++ b/res/raw/privoxy_config
@ -0,0 +1,27 @@
+# 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/res/raw/tor
+++ b/res/raw/tor
--- a/res/raw/torrc
+++ b/res/raw/torrc
@ -0,0 +1,12 @@
+SocksPort 9050
+SocksListenAddress 127.0.0.1
+SafeSocks 1
+Log notice stdout
+ControlPort 9051
+CookieAuthentication 1
+RelayBandwidthRate 20 KBytes
+RelayBandwidthBurst 20 KBytes
+UseBridges 0
+AutomapHostsOnResolve 1
+TransPort 9040
+DNSPort 5400
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">اوربوت (Orbot)</string>
+        <string name="app_version">1.0.5-dev</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="menu_about">حول</string>
+<string name="menu_wizard">Wizard</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">بدعم من مشروع تور</string>
+<string name="press_to_start">- long 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="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="pref_has_root">Request Root Access</string>
+<string name="pref_has_root_summary">Request root access for transparent proxying</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">Gibberbot - Secure instant messaging client for Android</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">market://search?q=pname:info.guardianproject.otr.app.im</string>
+    <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</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-ca/strings.xml
+++ b/res/values-ca/strings.xml
@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Orbot</string>
+        <string name="app_version">1.0.5-dev</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">Engega o atura Tor</string>
+    <string name="tor_proxy_service_process">torproxyservice</string>
+   
+<string name="status_starting_up">Orbot s\'està iniciant...</string>
+<string name="status_activated">Connectat a la xarxa Tor</string>
+<string name="status_disabled">Orbot està desactivat</string>
+<string name="status_shutting_down">Orbot s\'està aturant</string>
+
+<string name="tor_process_connecting">Iniciant Tor...</string>
+<string name="tor_process_connecting_step2">Preparant el control...</string>
+<string name="tor_process_connecting_step3">acomplert.</string>
+<string name="tor_process_connecting_step4">esperant.</string>
+
+<string name="not_anonymous_yet">ATENCIÓ : El trànsit de la teva connexió ja no es anònim! Siusplau, configura les teves aplicacions per a usar HTTP proxy 127.0.0.1:8118, per SOCKS4A o SOCKS5 proxy 127.0.0.1:9050</string>
+<string name="menu_home">Lloc d\'inici</string>
+<string name="menu_browse">Navega</string>
+<string name="menu_settings">Preferències</string>
+<string name="menu_log">Registre</string>
+<string name="menu_info">Ajut</string>
+<string name="menu_apps">Aplicacions</string>
+<string name="menu_start">Inici</string>
+<string name="menu_stop">Atura</string>
+
+<string name="menu_about">Quant a...</string>
+<string name="menu_wizard">Wizard</string>
+
+
+<string name="button_help">Ajut</string>
+<string name="button_close">Tanca</string>
+<string name="button_about">Quant a...</string>
+
+<string name="button_clear_log">Esborra el registre</string>
+
+
+<string name="menu_verify">Prova</string>
+<string name="menu_exit">Surt</string>
+<string name="powered_by">Funciona gràcies al Projecte Tor</string>
+<string name="press_to_start">- long press to start -</string>
+
+<string name="pref_trans_proxy_group">Utilitza un proxy transparent (requereix accés)</string>
+<string name="pref_trans_proxy_title">Utilitza un proxy transparent</string>
+<string name="pref_trans_proxy_summary">Automatitza Tor per a les aplicacions</string>
+
+<string name="pref_transparent_all_title">Automatitza Tor per a tot</string>
+<string name="pref_transparent_all_summary">Canalitza tot el trànsit de proxy de les aplicacions per 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="pref_has_root">Request Root Access</string>
+<string name="pref_has_root_summary">Request root access for transparent proxying</string>
+
+<string name="status_install_success">Binaris de Tor instal·lats correctament!</string>
+<string name="status_install_fail">Els fitxers binaris de Tor no s\'han pogut instalar. Per favor, comprova el registre i notifica-ho a tor-assistants@torproject.org</string>
+
+<string name="title_error">Error de l\'aplicació</string>
+
+<string name="wizard_title">Benvingut/da a Orbot</string>
+
+<string name="wizard_btn_tell_me_more">Quant a Orbot...</string>
+<string name="btn_next">Següent</string>
+<string name="btn_back">Enrere</string>
+<string name="btn_finish">Fi</string>
+
+<string name="btn_okay">D\'acord</string>
+<string name="btn_cancel">Cancel·la</string>
+
+
+<!-- Welcome Wizard strings (DJH) -->
+ 
+    <string name="wizard_welcome_msg">Orbot et porta Tor a l\'Android. Tor és programari lliure i una xarxa oberta que t\'ajuda a defensar-te d\'una vigilància a través de la xarxa, amenaçant la teva privacitat i llibertat personal, informació confidencial, activitats i relacions, i seguretat estatal coneguda com anàlisi de trànsit.
+
+*ALERTA:* Instal·lar Orbot _no_ convertirà la teva connexió en anònima instantàniament! Aquest assistent t\'ajudarà a començar.</string>
+    <string name="wizard_details">Alguns detalls d\'Orbot...</string>
+    <string name="wizard_details_msg">Orbot és una aplicació de codi lliure que conté Tor, LibEvent i Privoxy. Proporciona un Proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. Orbot també té capacitat d\'enviar tot el trànsit de dades d\'internet a través de Tor.</string>
+    <string name="wizard_permissions_root">Permís concedit</string>
+    <string name="wizard_permissions_stock">Permisos d\'Orbot</string>
+    <string name="wizard_premissions_msg_root">Perfecte! Hem detectat que tens els permisos matriu activats per a Orbot. Utilitzarem aquest poder sàviament.</string>
+    <string name="wizard_permissions_msg_stock">Encara que no és imprescindible, Orbot pot esdevenir una eina molt més potent si el teu terminal té accés complet. Utilitza el botó d\'aquí sota per conferir superpoders a Orbot!</string>
+   
+    <string name="wizard_permissions_no_root">Si no tens accés complet, o no tens ni idea del què t\'estem parlant, simplement assegura\'t d\'utilitzar aplicacions fetes per a funcionar amb Orbot.</string>
+    <string name="wizard_permissions_consent">Ho entenc i vull continuar sense accés complet.</string>
+   
+    <string name="wizard_permission_enable_root">Concedeix accés complet a Orbot</string>
+    <string name="wizard_configure">Configura la connexió a Tor</string>
+    <string name="wizard_configure_msg">Orbot t\'ofereix l\'opció de conduir el trànsit de totes les aplicacions per Tor o bé escollir quines aplicacions vols utilitzar amb Tor.</string> 
+    <string name="wizard_configure_all">Connecta totes les aplicacions per Proxy per Tor.</string>
+    <string name="wizard_configure_select_apps">Selecciona aplicacions individuals per a funcionar amb Tor</string>
+    
+    
+    <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string>
+    <string name="wizard_tips_msg">T\'animem a descarregar-te &amp; utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string>
+    <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
+    <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat &amp; per a Orbot</string>
+    <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string>
+    
+    <string name="wizard_proxy_help_info">Configuració de Proxy</string>
+    <string name="wizard_proxy_help_msg">Si l\'aplicació d\'Android que estàs utilitzant admet l\'ús d\'un proxy HTTP o SOCKS, pots configurar-la per a connectar-se a Orbot i utilitzar Tor.
+
+
+La configuració de l\'amfitrió és 127.0.0.1 o "localhost". Per a HTTP, el port actiu és 8118. Per a SOCKS, el proxy és 9050. Hauries d\'utlitzar SOCKS4A o SOCKS5 si és possible.
+
+
+
+Pots aprendre més coses sobre l\'ús dels proxys a Android al FAQ de: http://tinyurl.com/proxyandroid
+    </string>
+    
+    <string name="wizard_final">Orbot és a punt!</string>
+    <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string>
+    
+    <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+    <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+    
+<!-- END Welcome Wizard strings (DJH) -->
+ 
+
+	<string name="connect_first_time">T\'has connectat correctament a la xarxa Tor, però això NO vol dir que el teu dispositiu sigui segur. Pots utilitzar la opció \'Comprova\' del menú per provar el teu navegador. 
+
+Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu electrònic a help@guardianproject.info per a saber-ne més.</string>
+
+	<string name="tor_check">Això obrirà el teu navegador web per defecte i es connectarà a https://check.torproject.org per tal de comprovar si Orbot està configurat correctament i estàs connectat/da a Tor.</string>
+
+	
+    <string name="pref_hs_group">Serveis ocults</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
@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Orbot</string>
+        <string name="app_version">1.0.5-dev</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="menu_about">Über</string>
+<string name="menu_wizard">Wizard</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">Log löschen</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">- long press to start -</string>
+
+<string name="pref_trans_proxy_group">Transparenter Proxy (benötigt Administratorrechte)</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="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="pref_has_root">Request Root Access</string>
+<string name="pref_has_root_summary">Request root access for transparent proxying</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üfen Sie das Logfile und wenden Sie sich 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 ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string>
+    <string name="wizard_permissions_root">Erlaubnis erteilt</string>
+    <string name="wizard_permissions_stock">Orbot Rechte</string>
+    <string name="wizard_premissions_msg_root">Exzellent! Wir haben festgestellt, dass Sie Orbot Administrator-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 ihm Administrator-Rechte einräumen. Drücken Sie auf den Kopf unten um Orbot diese Superkräfte einzuräumen.</string>
+   
+    <string name="wizard_permissions_no_root">Falls Sie keinen Administrator-Zugang haben oder nicht wissen was das ist, stellen Sie sicher, dass Sie Anwendungen benutzen die mit Orbot kompatibel können.</string>
+    <string name="wizard_permissions_consent">Ich habe verstanden und möchte ohne Administrator-Rechte weitermachen.</string>
+   
+    <string name="wizard_permission_enable_root">Orbot Administrator-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">Gibberbot - Secure instant messaging client for 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-Einstellungen - Lernen Sie Anwendungen so zu konfigurieren, dass sie mit Orbot zusammenarbeiten.</string>
+    
+    <string name="wizard_proxy_help_info">Proxy-Einstellungen</string>
+    <string name="wizard_proxy_help_msg">Wenn das Android-Programm, das Sie benutzten die Verwendung von HTTP- oder SOCKS-Proxys unterstützt, können Sie 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 in den FAQ unter http://tinyurl.com/proxyandroid
+    </string>
+    
+    <string name="wizard_final">Orbot ist bereit!</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">market://search?q=pname:info.guardianproject.otr.app.im</string>
+    <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</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 Ihr Gerät sicher ist. Sie können die \'Überprüfen\'-Option aus dem Menü benutzen, um Ihren 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">Das wird die Seite https://check.torproject.org in Ihrem Webbrowser öffnen, so dass Sie überprüfen können, ob Orbot richtig configuriert ist und Sie mit Tor verbunden sind.</string>
+
+	
+    <string name="pref_hs_group">Versteckte Dienste</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-es/strings.xml
+++ b/res/values-es/strings.xml
@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Orbot</string>
+        <string name="app_version">1.0.5-dev</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="menu_about">Acerca de</string>
+<string name="menu_wizard">Wizard</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">- long press to start -</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="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="pref_has_root">Request Root Access</string>
+<string name="pref_has_root_summary">Request root access for transparent proxying</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">Gibberbot - Secure instant messaging client for 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">market://search?q=pname:info.guardianproject.otr.app.im</string>
+    <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</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
@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">اوربات</string>
+        <string name="app_version">1.0.5-dev</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="menu_about">درباره</string>
+<string name="menu_wizard">Wizard</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">- long 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="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="pref_has_root">Request Root Access</string>
+<string name="pref_has_root_summary">Request root access for transparent proxying</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">Gibberbot - Secure instant messaging client for Android</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">market://search?q=pname:info.guardianproject.otr.app.im</string>
+    <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</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-mk/strings.xml
+++ b/res/values-mk/strings.xml
@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Орбот</string>
+        <string name="app_version">1.0.5-dev</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">torproxyservice</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, 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="menu_about">За</string>
+<string name="menu_wizard">Wizard</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">напојувано од проектот Тор</string>
+<string name="press_to_start">- long 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="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="pref_has_root">Request Root Access</string>
+<string name="pref_has_root_summary">Request root access for transparent proxying</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">Орбот овозможува работа со Тор на Андроид. Тор е слободен софтвер и отворена мрежа којашто Ви помага да се заштитите од одреден вид мрежно прислушкување, познат како анализа на сообраќај (traffic analysis), кој претставуваат закана за личната слобода и приватност, за стопанските дејности и односи од доверлив карактер, како и за државната безбедност.\n\n*ВНИМАНИЕ:*Самиот факт што сте го инсталирале Орбот _нема_ автоматски да го направи Вашиот мобилен сообраќај анонимен! Но, овој прозор ќе Ви помогне да се иницирате.</string>
+    <string name="wizard_details">Некои детали за Орбот</string>
+    <string name="wizard_details_msg">Орбот е апликација со отворен код којашто го содржи Тор, LibEvent и Privoxy. Таа Ви нуди локални проксиња за 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">Орбот ви овозможува, или да го рутирате сиот сообраќај на сите апликации низ Тор, или поединечно да ги избирате апликациите.</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">Gibberbot - Secure instant messaging client for Android</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, тогаш може да ја конфигурирате да се поврзе со Орбот и да користи Тор. \n\n
+    Подесувањето за хост е 127.0.0.1 или „localhost“. За HTTP, подесувањето на порт е 8118. За SOCKS, портот е 9050. Доколку можете, користете SOCKS4A или SOCKS5.
+    \n\n
+    Можете да научите повеќе за проксирањето на Андроид преку ЧПП на: http://tinyurl.com/proxyandroid
+    </string>
+    
+    <string name="wizard_final">Орбот е спремен!</string>
+    <string name="wizard_final_msg">Стотици илјади луѓе низ целиот Свет го користат Тор од многу различни причини: новинари и блогери, борци за човекови права, полицајци, војници, корпорации, граѓани на репресивни режими, и обични граѓани... а сега и Вие сте спремин да го користите!</string>
+    
+    <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
+    <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+    
+<!-- END Welcome Wizard strings (DJH) -->
+ 
+
+	<string name="connect_first_time"> Успешно се поврзавте на мрежата Тор - но ова НЕ значи дека важиот уред е сигурен. За да го проверите Вашиот браусер, изберете ја опцијата „Провери“ во менито. \n\nПосетете нѐ на 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-nb/strings.xml
+++ b/res/values-nb/strings.xml
@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Orbot</string>
+        <string name="app_version">1.0.5-dev</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="menu_about">About</string>
+<string name="menu_wizard">Wizard</string>
+
+
+<string name="pref_has_root">Request Root Access</string>
+<string name="pref_has_root_summary">>Request root access for transparent proxying</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
@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Orbot</string>
+        <string name="app_version">1.0.5-dev</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="menu_about">Over</string>
+<string name="menu_wizard">Wizard</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">- long press to start -</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="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="pref_has_root">Request Root Access</string>
+<string name="pref_has_root_summary">Request root access for transparent proxying</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">Gibberbot - Secure instant messaging client for 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">market://search?q=pname:info.guardianproject.otr.app.im</string>
+    <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nathan Freitas	551247b64b	updating project files, including re-enabling onBoot mode for Orbot service svn:r24716	2011-05-03 05:58:58 +00:00
Nathan Freitas	a6c5377564	updating strings, layouts and drawables. removing unneeded busybox binary. svn:r24715	2011-05-03 05:58:19 +00:00
Nathan Freitas	4733f1a356	general cleanup on detecting iptables status and startup/shutdown calls svn:r24714	2011-05-03 05:56:40 +00:00
Nathan Freitas	55338abba4	merged __sporkbomb's xclnt patch for fixing transproxy all mode svn:r24713	2011-05-03 05:56:04 +00:00
Nathan Freitas	517c2ab209	added in original submitted patches for posterity svn:r24712	2011-05-03 05:54:24 +00:00
Runa A. Sandvik	59e0609ab1	updated Orbot translations svn:r24706	2011-05-02 16:11:38 +00:00
Nathan Freitas	22757c3a34	committing strings updates for 1.0.5... svn:r24649	2011-04-17 16:16:31 +00:00
Nathan Freitas	f952a0e60e	moves settings to proper Android imp of background thread svn:r24648	2011-04-17 16:15:56 +00:00
Nathan Freitas	24108e1206	Updated UI for start/stop notifications and systems preferences svn:r24646	2011-04-17 06:05:02 +00:00
Nathan Freitas	28379e1d57	Improved transproxy code for background service svn:r24645	2011-04-17 06:04:27 +00:00
Nathan Freitas	40fa9fda0a	modified layout of main and about dialogs svn:r24644	2011-04-17 06:03:32 +00:00
Nathan Freitas	d3d37ab91e	added Privoxy info and link to about dialog svn:r24634	2011-04-16 13:21:22 +00:00
Nathan Freitas	3a801fc5c4	updating our license to include Privoxy svn:r24633	2011-04-16 13:16:49 +00:00
Nathan Freitas	bcfcd97b8d	small changes to README etc files svn:r24632	2011-04-15 16:39:35 +00:00
Nathan Freitas	7d1793ea13	handling settings update to stop hanging svn:r24631	2011-04-15 16:39:22 +00:00
Nathan Freitas	f2aa800ce6	adding binaries to res/raw folder svn:r24630	2011-04-15 16:38:53 +00:00
Nathan Freitas	d2f2caf7e2	new gibberbot icon for wizard svn:r24629	2011-04-15 16:38:19 +00:00
Nathan Freitas	ebc742784c	update to string for wizard with gibberbot link svn:r24628	2011-04-15 16:37:58 +00:00
Nathan Freitas	21d01598cd	update to service with new transproxy/iptables code svn:r24627	2011-04-15 16:37:33 +00:00
Nathan Freitas	644ce2700d	updated version number svn:r24626	2011-04-15 16:36:36 +00:00
Nathan Freitas	09c24253b4	adding in iptables API wrapper class from Droidwall svn:r24625	2011-04-15 05:57:52 +00:00
Runa A. Sandvik	d405f4cb00	minor modification to the script, new translations for mk, updated translations for ca svn:r24383	2011-03-18 08:52:46 +00:00
Runa A. Sandvik	a89c0bf4cb	translation xml files for orbot svn:r24286	2011-03-02 15:26:23 +00:00
Nathan Freitas	0532931351	removing unused Socks client code from Orbot svn:r24204	2011-02-09 21:11:53 +00:00
Runa A. Sandvik	4fa07d21ea	updated translations for orbot svn:r23481	2010-10-09 11:57:03 +00:00
Nathan Freitas	a49bb0484f	adding new classes for handling on boot svn:r23291	2010-09-23 21:03:40 +00:00
Nathan Freitas	ecd0a8a195	fixes #1947 bug; adds Start on Boot option; v1.0.4-RC5 svn:r23290	2010-09-23 19:47:25 +00:00
Nathan Freitas	67c98e8bdd	fixed app url links svn:r23270	2010-09-21 01:50:24 +00:00
Nathan Freitas	f6571fb896	fixed permission issues; added green notification icon; improved root/su checking logic svn:r23269	2010-09-21 01:26:40 +00:00
Runa A. Sandvik	35d31325f2	updated translations for orbot svn:r23251	2010-09-19 12:59:22 +00:00
Nathan Freitas	dd7191bc49	updates app version in localized strings; fixed FC/NPE issue on sublaunch from notification bar svn:r23224	2010-09-18 12:38:15 +00:00
Nathan Freitas	9f84c87d0b	checking in what should be 1.0.4 svn:r23223	2010-09-17 21:32:21 +00:00
Runa A. Sandvik	89f0944f0f	fixed the translations svn:r23222	2010-09-17 21:05:08 +00:00
Runa A. Sandvik	1a92400844	minor cleanup svn:r23221	2010-09-17 21:03:33 +00:00
Runa A. Sandvik	2424b889df	thanks to Clint for fixing my regex svn:r23220	2010-09-17 21:01:05 +00:00
Nathan Freitas	9d35ac685a	fixed double escape slashes for single quotes in arabic, german, polish string xml files svn:r23218	2010-09-17 19:03:41 +00:00
Runa A. Sandvik	dedbf5018c	updated translations for orbot svn:r23216	2010-09-17 18:54:08 +00:00
Nathan Freitas	2dffe4f45e	making sure the latest updates are pushed up svn:r23210	2010-09-17 16:52:41 +00:00
Runa A. Sandvik	7284486b12	new and updated translations for orbot svn:r23189	2010-09-14 18:30:59 +00:00
Runa A. Sandvik	5b36e59856	new and updated translations for orbot svn:r23165	2010-09-12 11:21:24 +00:00
Nathan Freitas	8fdae3b7d5	updated changelog for 1.0.3 svn:r23162	2010-09-11 20:17:19 +00:00
Nathan Freitas	1f1221d204	fixing apostrophe issues - was using double escape slashes instead of one svn:r23161	2010-09-11 20:16:40 +00:00
Nathan Freitas	034479dcb5	modifying localized xml files svn:r23160	2010-09-11 04:10:04 +00:00
Nathan Freitas	d7086468af	added LOG_OUTPUT_TO_DEBUG variable for compile time on/off of log output to Android stdout svn:r23157	2010-09-09 22:09:01 +00:00
Nathan Freitas	704006ea92	fixed TransProxy DNS port (was pointing at 9040 instead of 5400); added filter drop rules for iptables 1.4.4 and higher svn:r23156	2010-09-09 21:47:06 +00:00
Nathan Freitas	b62a522287	removed debuggable settings in AndroidManifest and waitfordebugger calls in service code svn:r23155	2010-09-09 20:42:14 +00:00
Nathan Freitas	48711d3efc	alpha-1.0.3 RC1: cleaned up unnecessary log output; improved iptables handling for transproxy svn:r23154	2010-09-09 20:39:52 +00:00
Runa A. Sandvik	26396a2325	updated translations for orbot svn:r23116	2010-09-03 09:32:05 +00:00
Nathan Freitas	9308135f70	fixed http link for otrchat download - moved back to http since github https is invalid svn:r22902	2010-08-14 05:19:49 +00:00
Nathan Freitas	ae3d6f6884	added "check" yes/no dialog prompt; debuged iptables/transprox settings on Android 1.6 and 2.2 svn:r22901	2010-08-14 05:08:55 +00:00
Erinn Clark	774577b54c	update version string in AndroidManifest.xml too, bump everything to 1.0.2 svn:r22899	2010-08-13 20:48:15 +00:00
Erinn Clark	7324195fd3	update version to 1.0.1 for new Orbot release svn:r22888	2010-08-12 19:36:10 +00:00
Runa A. Sandvik	6129bbec26	minor fixes svn:r22862	2010-08-11 18:53:20 +00:00
Nathan Freitas	1016a1ab08	added new proxy settings layout xml svn:r22853	2010-08-10 16:44:14 +00:00
Nathan Freitas	38ace36766	added proxy settings help screen and fixed processSettings() NPE svn:r22852	2010-08-10 16:43:32 +00:00
Erinn Clark	1e1f401464	update version string to 1.0.0 for market release svn:r22845	2010-08-09 21:10:36 +00:00
Nathan Freitas	024f00dfb2	turning off debuggable state svn:r22843	2010-08-09 20:21:47 +00:00
Nathan Freitas	bc3cba8354	removing hidden service in default config svn:r22842	2010-08-09 20:21:30 +00:00
Nathan Freitas	a4c602d50a	updated change log with all the latest fixes, w/ links to trac tickets svn:r22805	2010-08-04 12:55:23 +00:00
Nathan Freitas	54276645ea	updated change log with all the latest fixes, w/ links to trac tickets svn:r22804	2010-08-04 12:54:13 +00:00
Nathan Freitas	2b814e1eaa	found and fixed major bug in per-app trans proxing - list of apps was being cached and iptables rules were not properly updated as the user changed the selection in the list svn:r22802	2010-08-04 10:16:38 +00:00
Nathan Freitas	0bc5f8f640	updates related to motorola milestone debugging and iptables transproxy settings svn:r22743	2010-07-31 15:43:56 +00:00
Nathan Freitas	e9f6a2b7fe	including iptables binary for rooted devices that do not have their own, like the motorola milestone svn:r22741	2010-07-31 15:42:48 +00:00
Erinn Clark	4979de01fe	bump Orbot version to 0.2.2.14-alpha-orbot-0.0.10 svn:r22732	2010-07-30 22:17:09 +00:00
Nathan Freitas	763a325aaa	adding missing icon pngs svn:r22731	2010-07-30 21:56:33 +00:00
Nathan Freitas	5bf0e69cac	updated root perm cacheing issue and help wizard dialogs svn:r22729	2010-07-30 20:19:13 +00:00
Nathan Freitas	11f3fe7fc3	fix for root perms bug svn:r22707	2010-07-29 17:03:34 +00:00
Erinn Clark	60cfa10480	update BUILD with new android target, update strings for new versions of Tor and Orbot svn:r22703	2010-07-29 15:00:10 +00:00
Nathan Freitas	c94c2a8ad5	big checkin for 0.0.8-beta-280710a build with new start wizard, improved ctrlport handling, and root config svn:r22697	2010-07-28 04:43:58 +00:00
Nathan Freitas	5810b33fc5	fixed issue with force close crash on install svn:r22685	2010-07-24 03:24:30 +00:00
Nathan Freitas	183a58f39f	modified control port usage, updated startup UI screen, implemented all-app torification and more svn:r22677	2010-07-23 11:10:00 +00:00
Nathan Freitas	7d7a33b983	fixed path for control port cookie lookup - moved from /data to /cache svn:r22667	2010-07-19 22:39:50 +00:00
Nathan Freitas	bea25c22d7	multiple updates related to pending 0.0.8 including fixes for trac #1388 #1509 #1530 #1513 #1333 svn:r22666	2010-07-19 22:34:15 +00:00
Runa A. Sandvik	26bb7a6f5e	we need to escape every apostrophe, including update for nl svn:r22663	2010-07-19 14:55:54 +00:00
Runa A. Sandvik	497b206ab3	use zh instead of zh_CN svn:r22662	2010-07-19 14:40:43 +00:00
Runa A. Sandvik	d664a52fdb	moved the script and converted a few translated files svn:r22661	2010-07-19 14:40:08 +00:00
Nathan Freitas	2cdba0c467	updated graphics svn:r22647	2010-07-18 14:03:48 +00:00
Erinn Clark	f9175fc67b	add missing zlib directory name to build instructions svn:r22580	2010-06-30 21:54:02 +00:00
Runa A. Sandvik	4a5f54cddf	orbot translations svn:r22548	2010-06-23 15:53:17 +00:00
Runa A. Sandvik	88b9f360c8	convert orbot translations from po to xml svn:r22546	2010-06-23 15:34:49 +00:00
Erinn Clark	25d1dd0e0a	bump orbot version for release to fix issues with android 2.2/froyo svn:r22510	2010-06-14 22:10:53 +00:00
Nathan Freitas	d44f2c4532	fixed TorBinaryInstaller issue on Android OS 2.2/Froyo. Now looks for APK file with incremented path name -1 -2 -3 etc svn:r22498	2010-06-09 20:14:03 +00:00
Sebastian Hahn	9c813c255b	Remove all @Override annotations Some build errors related to these annotations occurred, and they're not necessary. Remove them. Fix suggested by n8fr8. svn:r22440	2010-05-29 07:11:29 +00:00
Jacob Appelbaum	0cab5fbef3	add some stuff for transproxy svn:r22438	2010-05-28 17:02:13 +00:00
Sebastian Hahn	739123b315	Don't build the Tor manpages svn:r22437	2010-05-28 16:47:45 +00:00
Sebastian Hahn	b720dff1d3	Make it easier for others to be a little less stupid than I was. svn:r22436	2010-05-28 16:11:10 +00:00
Sebastian Hahn	c266823653	Add a missing space to the build instructions svn:r22435	2010-05-28 15:59:30 +00:00
Erinn Clark	5820c17b14	bump to 0.0.7 for non-debug release svn:r22407	2010-05-27 01:58:05 +00:00
Jacob Appelbaum	bcead4363f	url correction svn:r22406	2010-05-26 15:35:08 +00:00
Jacob Appelbaum	5bcadba49c	Security fix suggeted by Jesse Burns from iSec Partners svn:r22401	2010-05-26 14:12:27 +00:00
Erinn Clark	baafbea7d7	bump versions to orbot 0.0.6 and tor 0.2.2.13 svn:r22369	2010-05-19 08:20:39 +00:00
Nathan Freitas	e8dba21690	added rough spanish localization as a first attempt at additional lang support svn:r22301	2010-05-08 04:55:37 +00:00
Nathan Freitas	834314d98d	fixed primary activity bugs with displaying help resources svn:r22300	2010-05-08 04:54:52 +00:00
Nathan Freitas	6aa6bf19dc	removed now unused NanoHTTPD and TorWebProxy classes from service package svn:r22299	2010-05-08 04:21:45 +00:00
Nathan Freitas	0fc6ddc4e4	modifications around resource string layout and alert dialogs svn:r22298	2010-05-08 04:19:06 +00:00
Nathan Freitas	28758122f9	updated resource strings in order to enable use of translation portal / pootle svn:r22297	2010-05-08 04:18:24 +00:00
Nathan Freitas	b15e7a6a10	adding TODO file with GSoC ideas in here as well svn:r22105	2010-03-31 21:55:29 +00:00
Roger Dingledine	e45b9a8cc1	two more fixes, then call it good for now svn:r22011	2010-03-18 05:01:08 +00:00
Roger Dingledine	867cde2597	reformat, fix typos and urls, etc svn:r22010	2010-03-18 04:52:53 +00:00
Roger Dingledine	72bf41686e	fix a few typos svn:r22009	2010-03-18 04:37:53 +00:00
Roger Dingledine	6ab5ca2baa	pretend that unix and dos have the same line ending conventions svn:r22008	2010-03-18 04:23:45 +00:00
Nathan Freitas	2a352e16bc	returned AUTHORS file to its proper and rightful state svn:r22007	2010-03-18 03:25:45 +00:00
Nathan Freitas	8c6fdea6b2	updated changelog and resource definition files svn:r22006	2010-03-18 03:15:40 +00:00
Nathan Freitas	6f582d85a2	fixed a few small bugs, added new network package classes for future functionality svn:r22005	2010-03-18 03:15:20 +00:00
Jacob Appelbaum	fa38ffcef5	add a note that we're only a non-exit relay svn:r21855	2010-03-08 07:01:11 +00:00
Erinn Clark	634e32d639	bump orbot version to prepare for new release, update tor version listed in layout svn:r21854	2010-03-08 06:33:34 +00:00
Nathan Freitas	a0295c2803	fixed the way disabling of certain settings works on non-root devices svn:r21851	2010-03-08 03:34:17 +00:00
Roger Dingledine	e2f5ac0929	found this typo, and it seems i can commit, so here we are svn:r21844	2010-03-07 03:07:53 +00:00
Nathan Freitas	8e8153bc38	fixed small issue with bridge list field validation - correctly identifies if address entered when bridges are enabled svn:r21831	2010-03-06 17:04:18 +00:00
Nathan Freitas	6c19f0c7e7	added Privoxy running confirmation; also reachableports and relay support (added by ioerror) have been double-checked svn:r21830	2010-03-06 15:02:04 +00:00
Nathan Freitas	3b6a5c4862	many fixes include landscape view, invalid settings handling and cleanup of shell cmd code svn:r21829	2010-03-06 14:56:39 +00:00
Jacob Appelbaum	996eb6dbe6	remove reference to fascistFirewall svn:r21828	2010-03-06 04:50:18 +00:00
Jacob Appelbaum	be5454841b	replacing FascistFirewalling with ReachableAddresses svn:r21827	2010-03-06 04:46:53 +00:00
Nathan Freitas	d20521f590	tweaked the new settings for relays and firewalls; updated parsing script too svn:r21826	2010-03-06 04:11:36 +00:00
Jacob Appelbaum	47de5f9c10	Add FascistFirewall preference svn:r21825	2010-03-06 02:06:00 +00:00
Jacob Appelbaum	2ad1ed610a	remove dupe, reorder key svn:r21824	2010-03-06 01:27:51 +00:00
Jacob Appelbaum	3800147e22	Add an option for Relay support to Orbot! svn:r21823	2010-03-06 01:23:36 +00:00
Jacob Appelbaum	dea398d0cc	Add PREF_OR_NICKNAME svn:r21822	2010-03-06 01:08:10 +00:00
Jacob Appelbaum	cd8ede4988	add pref_or_nickname svn:r21821	2010-03-06 01:07:19 +00:00
Jacob Appelbaum	63ed2e0087	pref_or rather than pref_relay svn:r21820	2010-03-06 00:46:46 +00:00
Jacob Appelbaum	3d93750c61	PREF_OR rather than PREF_RELAY svn:r21819	2010-03-06 00:45:57 +00:00
Jacob Appelbaum	9d91abd396	Add prefs for relay and fascist firewalling Adds the following prefs: PREF_RELAY (default false) PREF_RELAY_PORT (default 9001) PREF_FASCIST_FIREWALL (default false) PREF_FASCIST_FIREWALL_PORTS (default 80,443) svn:r21818	2010-03-06 00:44:56 +00:00
Jacob Appelbaum	91b2e13c44	Update strings to reflect proper urls, better phrasing svn:r21817	2010-03-06 00:01:59 +00:00
Nathan Freitas	831ccc4060	improved activate button responsive to be more instant svn:r21778	2010-03-01 06:15:35 +00:00
Nathan Freitas	4316b5c96d	added new main screen button/status images that ioerror said were 31337 svn:r21777	2010-03-01 05:53:31 +00:00
Nathan Freitas	ce65c91546	removed home, browse menu options; added beter non-root operation svn:r21776	2010-03-01 05:52:44 +00:00
Nathan Freitas	a8080d4011	added new list layout resources for transproxy app chooser view svn:r21762	2010-02-27 23:57:22 +00:00
Nathan Freitas	245cef1e32	added transproxy app chooser view svn:r21761	2010-02-27 23:56:46 +00:00
Nathan Freitas	eafeb64b9c	added check for trans proxy preference svn:r21749	2010-02-24 05:09:24 +00:00
Nathan Freitas	d9664a03ae	updated resources file to add new preferences, modified help text svn:r21748	2010-02-24 05:09:05 +00:00
Erinn Clark	26fb64a21c	Updated build instructions with new CPPFLAGS for privoxy svn:r21730	2010-02-23 04:45:50 +00:00
Nathan Freitas	18ca530e5d	updated application manifest svn:r21606	2010-02-10 07:01:11 +00:00
Nathan Freitas	789b30f9f3	minor UI tweaks - removed title bar, changed icon, edited prefs text svn:r21605	2010-02-10 07:00:47 +00:00
Nathan Freitas	7b5677227d	added transparent proxying of port 443 via Tor TransPort and modifed browse check to https://check.torproject.org svn:r21604	2010-02-10 06:54:13 +00:00
Nathan Freitas	01bf3d0fd1	adding new/missing string resources svn:r21595	2010-02-08 20:43:38 +00:00
Nathan Freitas	03fa06bb55	adding new image resource to Orbot svn:r21594	2010-02-08 20:42:49 +00:00
Nathan Freitas	7b0717d1e4	migrating Orbot codebase from old repo and updating to 0.0.3a svn:r21593	2010-02-08 20:39:42 +00:00
Nathan Freitas	64b7089f93	fixing sh*t I broke due to strange Android build process (re-adding src files) svn:r21068	2009-11-30 16:50:26 +00:00
Nathan Freitas	1b587ab9d1	removed duplicated java files from /bin directory svn:r21067	2009-11-30 16:40:32 +00:00
Nathan Freitas	c4eeb6040f	removed unused resources svn:r21066	2009-11-30 16:39:41 +00:00
Nathan Freitas	20f0dfee49	0.0.2a update; improved Service mgmt; Control Port callbacks; better UI graphics; Help page svn:r21065	2009-11-30 16:39:13 +00:00
Nathan Freitas	81625a112a	Orbot 0.0.2: major UI improvements w/ editable settings and more svn:r21042	2009-11-28 15:41:28 +00:00
Nathan Freitas	5c45410dc7	Removed bin folder from project svn:r21010	2009-11-22 21:25:39 +00:00
				`@ -0,0 +1 @@`
				`org.eclipse.wst.jsdt.launching.baseBrowserLibrary`
				`@ -1 +0,0 @@`
				`Subproject commit 90ae4c5013032158bafad41279823d90eec4d206`
				`@ -1 +0,0 @@`
				`Subproject commit e71ebf275da66dfd601c92e0e80a35114c32f6f8`
				`@ -1 +0,0 @@`
				`Subproject commit da95b91355248ad8f3a6aa6733cc6d24915f59ce`
				`@ -1 +0,0 @@`
				`Subproject commit 3d566cd519017eee1a400e7961ff14058dfaf33c`
				`@ -1 +0,0 @@`
				`Subproject commit f4340f46b2387bc8de7d5320c0b83bb1499933ad`