From 8d6e657708d815ac490abf46699d3689ec037123 Mon Sep 17 00:00:00 2001
From: Nathan Freitas <nathan@freitas.net>
Date: Thu, 18 Mar 2010 03:15:40 +0000
Subject: [PATCH] updated changelog and resource definition files

svn:r22006
---
 AUTHORS                | 17 ++++-------------
 AndroidManifest.xml    |  5 ++---
 CHANGELOG              |  8 +++++++-
 README                 |  2 +-
 default.properties     |  2 +-
 res/values/strings.xml |  6 ++++--
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2690a6f2..54902397 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,7 @@
-  				This file lists the authors for Orbot,
-        a free software project to provide anonymity on the Internet on Android smartphones.
+  				This file lists the authors for Orweb,
+        a free software project to provide anonymity web browsing on Android smartphones.
 
-       For more information about Orbot, see http://openideals.com/guardian
+       For more information about Orweb, see http://guardianproject.info/apps/orweb
 
              If you got this file as a part of a larger bundle,
         there are probably other authors that you should be aware of.
@@ -12,16 +12,7 @@ Main Authors:
 Nathan Freitas <nathan@freitas.net> developed the primary
 Android application and managed the porting of Tor to Android.
 
-Jake Appelbaum <jake@appelbaum.net > regular gave Nathan a
-swift kick in the rear to get this done. He has also provided
-extensive guidance and review. Most recently he has been
-promoted to Chief Application Resource Editor.
 
 Contributors:
 -------------
-Nick Mathewson <nickm@freehaven.net> wrote some of the patch
-code to support the compiling of Tor and LibEvent on Android,
-and generaly provided guidance in the entire effort.
-
-Adam Langley <> made the original valiant effort to port
-Tor to Android.
\ No newline at end of file
+Connell Gauld developed the original Shadow browser on which this project is based.
\ No newline at end of file
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b3629e0..21ce93c9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,10 +6,9 @@
        <uses-permission android:name="android.permission.INTERNET" />
  
  <!-- <uses-permission android:name="android.permission.WRITE_SETTINGS" /> -->
- 
  <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
  
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
         <activity android:name=".Orbot"
                   android:theme="@android:style/Theme.NoTitleBar"
                   >
@@ -27,7 +26,7 @@
         </activity>
            
            
-    	<service android:name=".service.TorService" android:process=":remote">
+    	<service android:name=".service.TorService" android:process=":remote"  android:debuggable="true">
 	            <intent-filter>
 	                <action android:name="org.torproject.android.service.ITorService" />
 	              	<action android:name="org.torproject.android.service.TOR_SERVICE" />
diff --git a/CHANGELOG b/CHANGELOG
index b32721d7..c5e3e3f0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,11 @@
+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
+- Added relay support for static/publicly accessible IP devices
+
 0.0.3a - 2010-02-07
-- Integrated iptables support for transparenty proxying of outbound port 80 and DNS
+- 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
diff --git a/README b/README
index 1e39413c..ffb829c6 100644
--- a/README
+++ b/README
@@ -22,4 +22,4 @@ Tor Frequently Asked Questions:
 
 ***********************************************
 
-/* Copyright (c) 2009, Nathan Freitas, The Guardian Project - http://openideals.com/guardian */
+/* Copyright (c) 2009, Nathan Freitas, The Guardian Project - http://guardianproject.info */
diff --git a/default.properties b/default.properties
index b6f84213..08ad68f1 100644
--- a/default.properties
+++ b/default.properties
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-2
+target=android-4
 apk-configurations=
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 589c8b97..cbc6de11 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8,8 +8,7 @@
     <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
     <string name="control_permission_label">start and stop Tor</string>
     <string name="tor_proxy_service_process">torproxyservice</string>
-    
-
+   
 <string name="status_starting_up">Orbot is starting...</string>
 <string name="status_activated">Connected to the Tor network</string>
 <string name="status_disabled">"Orbot is Deactivated</string>
@@ -27,6 +26,9 @@
 <string name="menu_log">Log</string>
 <string name="menu_info">Help</string>
 <string name="menu_apps">Apps</string>
+<string name="menu_start">Start</string>
+<string name="menu_stop">Stop</string>
+
 
 
 <string name="button_help">Help</string>