- tor-commits - lists.torproject.org

[metrics-web/master] Fix typo.
by karsten＠torproject.org 27 Feb '12

27 Feb '12

commit e048f05cee12a7a3607e5f7c84c27e1de73af559 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Feb 27 08:47:51 2012 +0100 Fix typo. --- web/WEB-INF/formats.jsp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index b84f9ef..f649554 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -94,7 +94,7 @@ descriptors, even though the incentive to do so is probably low. <blockquote> -Server descriptor published by relay <tt>blugmagie</tt> (without +Server descriptor published by relay <tt>blutmagie</tt> (without cryptographic keys and hashes):

1 0

r25481: {website} Removing Andrew from the Audit TBB project (website/trunk/getinvolved/en)
by Damian Johnson 27 Feb '12

27 Feb '12

Author: atagar Date: 2012-02-27 06:16:47 +0000 (Mon, 27 Feb 2012) New Revision: 25481 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Removing Andrew from the Audit TBB project Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-02-27 02:57:28 UTC (rev 25480) +++ website/trunk/getinvolved/en/volunteer.wml 2012-02-27 06:16:47 UTC (rev 25481) @@ -661,7 +661,7 @@ Skill Level: Medium - Likely Mentors: Erinn, Jacob, Andrew + Likely Mentors: Erinn and Jacob The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia user interface (and optionally the <a href="http://pidgin.im/">Pidgin</a> Instant Messaging client). Components are pre-configured to operate in a

1 0

[orbot/master] added installer for obfsproxy binary
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit d22ef2b1c53d30c4de19c32fb1ffd8458c7a058a Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:39:10 2012 -0500 added installer for obfsproxy binary --- .../android/service/TorBinaryInstaller.java | 5 ++++- .../android/service/TorServiceConstants.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index 0d79780..bb51422 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -73,7 +73,10 @@ public class TorBinaryInstaller implements TorServiceConstants { is = context.getResources().openRawResource(R.raw.privoxy_config); outFile = new File(installFolder, PRIVOXYCONFIG_ASSET_KEY); streamToFile(is,outFile, false, false); - + + is = context.getResources().openRawResource(R.raw.obfsproxy); + outFile = new File(installFolder, OBFSPROXY_ASSET_KEY); + streamToFile(is,outFile, false, false); return true; } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index c9d0cb4..8f8fc1b 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -82,6 +82,7 @@ public interface TorServiceConstants { public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED"; - + //obfsproxy + public static final String OBFSPROXY_ASSET_KEY = "obfsproxy"; }

1 0

[orbot/master] updating binaries and config files
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit 834188a22eef636473cedfffd3a2acc17b202d90 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:38:32 2012 -0500 updating binaries and config files --- res/raw/obfsproxy | Bin 724091 -> 724091 bytes res/raw/tor | Bin 4129189 -> 0 bytes res/raw/torrc | 16 +--------------- res/xml/preferences.xml | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/res/raw/obfsproxy b/res/raw/obfsproxy index ccab4ed..4ff390d 100755 Binary files a/res/raw/obfsproxy and b/res/raw/obfsproxy differ diff --git a/res/raw/tor b/res/raw/tor deleted file mode 100755 index 6c9a338..0000000 Binary files a/res/raw/tor and /dev/null differ diff --git a/res/raw/torrc b/res/raw/torrc index 94c3a13..1d25634 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -11,19 +11,5 @@ TransListenAddress 127.0.0.1 TransPort 9040 DNSListenAddress 127.0.0.1 DNSPort 5400 -UseBridges 1 -bridge obfs2 38.229.33.18:42401 -bridge obfs2 85.17.20.242:61264 -bridge obfs2 85.214.131.213:1051 -bridge obfs2 86.59.30.35:45605 -bridge obfs2 91.208.34.7:5353 -bridge obfs2 109.105.109.163:53999 -bridge obfs2 109.163.233.195:1051 -bridge obfs2 128.30.30.25:51420 -bridge obfs2 128.31.0.34:1051 -bridge obfs2 131.215.158.1:29936 -bridge obfs2 173.254.192.38:1051 -bridge obfs2 188.40.20.215:32982 -bridge obfs2 212.112.242.160:49259 -bridge obfs2 213.108.105.129:36609 +UseBridges 1 ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 40955db..02beff4 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -92,7 +92,7 @@ android:summary="@string/use_only_these_specified_nodes"/> </PreferenceCategory> <PreferenceCategory android:title="@string/bridges"> -<CheckBoxPreference android:defaultValue="false" +<CheckBoxPreference android:defaultValue="true" android:title="@string/use_bridges" android:key="pref_bridges_enabled" android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"></CheckBoxPreference>

1 0

[orbot/master] added HOME export setting for obfsproxy
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit 3ea0d1dcc1ee10c12bf00409a616c473067515bc Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:41:10 2012 -0500 added HOME export setting for obfsproxy --- src/org/torproject/android/service/TorService.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index e56539d..91e5e96 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -722,7 +722,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst torrcPath = new File(appBinHome, TORRC_TETHER_KEY).getAbsolutePath(); } - String[] torCmd = {fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n"}; + String[] torCmd = { + "export HOME=" + appBinHome.getAbsolutePath(), + fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n" + }; boolean runAsRootFalse = false; boolean waitForProcess = false;

1 0

[orbot/master] added, updated binaries and torrc
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit 2c9d6864764ce679365d4f8f5085232fd6bc3771 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 04:06:57 2012 -0500 added, updated binaries and torrc --- res/raw/obfsproxy | Bin 0 -> 724091 bytes res/raw/tor | Bin 0 -> 4129189 bytes res/raw/tor.mp3 | Bin 3466275 -> 0 bytes res/raw/torrc | 19 +++++++++++++++++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/res/raw/obfsproxy b/res/raw/obfsproxy new file mode 100755 index 0000000..ccab4ed Binary files /dev/null and b/res/raw/obfsproxy differ diff --git a/res/raw/tor b/res/raw/tor new file mode 100755 index 0000000..6c9a338 Binary files /dev/null and b/res/raw/tor differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 deleted file mode 100644 index 2a99768..0000000 Binary files a/res/raw/tor.mp3 and /dev/null differ diff --git a/res/raw/torrc b/res/raw/torrc index f3d79d2..94c3a13 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -6,9 +6,24 @@ ControlPort 9051 CookieAuthentication 1 RelayBandwidthRate 20 KBytes RelayBandwidthBurst 20 KBytes -UseBridges 0 AutomapHostsOnResolve 1 TransListenAddress 127.0.0.1 TransPort 9040 DNSListenAddress 127.0.0.1 -DNSPort 5400 \ No newline at end of file +DNSPort 5400 +UseBridges 1 +bridge obfs2 38.229.33.18:42401 +bridge obfs2 85.17.20.242:61264 +bridge obfs2 85.214.131.213:1051 +bridge obfs2 86.59.30.35:45605 +bridge obfs2 91.208.34.7:5353 +bridge obfs2 109.105.109.163:53999 +bridge obfs2 109.163.233.195:1051 +bridge obfs2 128.30.30.25:51420 +bridge obfs2 128.31.0.34:1051 +bridge obfs2 131.215.158.1:29936 +bridge obfs2 173.254.192.38:1051 +bridge obfs2 188.40.20.215:32982 +bridge obfs2 212.112.242.160:49259 +bridge obfs2 213.108.105.129:36609 +ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed

1 0

[orbot/master] added filter for bridge and bridge+obfs urls
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit a2653393b07c88eff19217c236596a20c9da576a Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:40:53 2012 -0500 added filter for bridge and bridge+obfs urls --- AndroidManifest.xml | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 060cc4e..1850135 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?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.3.10-alpha-orbot-1.0.7-FINAL" - android:versionCode="32" + android:versionName="0.2.3.11-alpha-1.0.8a-OBFS" + android:versionCode="33" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> @@ -24,6 +24,14 @@ <category android:name="android.intent.category.BROWSABLE" /> </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" /> + <data android:scheme="bridge" /> + <data android:scheme="bridge+obfs" /> + </intent-filter> + <intent-filter> <category android:name="android.intent.category.DEFAULT" /> <action android:name="org.torproject.android.REQUEST_HS_PORT" />

1 0

[orbot/master] adding compressed tor binary as mp3 - don't ask!
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit c68d8c3a45ab6058e79c5e8cdf33845e9b4dd941 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:41:58 2012 -0500 adding compressed tor binary as mp3 - don't ask! --- res/raw/tor.mp3 | Bin 0 -> 1732881 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 new file mode 100644 index 0000000..01dc695 Binary files /dev/null and b/res/raw/tor.mp3 differ

1 0

[orbot/master] updated way for checking for ROOT
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit 790acb8a5354745204ae5f0fdcbc3eb7d5dca4f6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:41:25 2012 -0500 updated way for checking for ROOT --- .../android/settings/SettingsPreferences.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index 1545df6..35c4314 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -118,7 +118,21 @@ public class SettingsPreferences if (prefRequestRoot.isChecked()) { - boolean canRoot = TorServiceUtils.isRootPossible(); + //boolean canRoot = TorServiceUtils.isRootPossible(); + boolean canRoot; + + try + { + StringBuilder res = new StringBuilder(); + String[] cmd = {"ls /data/data"}; //only root can do this! + int code = TorServiceUtils.doShellCommand(cmd, res, true, true); + canRoot = code > -1; + } + catch (Exception e) + { + //probably not root + canRoot = false; + } getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX).setEnabled(canRoot); prefRequestRoot.setChecked(canRoot);

1 0

[orbot/master] added new default values for obfs bridges
by n8fr8＠torproject.org 26 Feb '12

26 Feb '12

commit a809eb9aa01b9f78c365644f49c1c43500e00718 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 01:23:03 2012 -0500 added new default values for obfs bridges --- res/raw/torrc | 1 - res/values/strings.xml | 3 +++ res/xml/preferences.xml | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/res/raw/torrc b/res/raw/torrc index 1d25634..93feb42 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -11,5 +11,4 @@ TransListenAddress 127.0.0.1 TransPort 9040 DNSListenAddress 127.0.0.1 DNSPort 5400 -UseBridges 1 ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed diff --git a/res/values/strings.xml b/res/values/strings.xml index 0ea4089..94299a1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -256,4 +256,7 @@ <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> + +<string name="default_bridges">obfs2 146.185.23.182:8080,obfs2 108.166.107.30:42396,obfs2 18.85.35.209:49937,obfs2 143.215.129.51:35777,obfs2 68.22.187.113:45672,obfs2 209.176.111.36:38297,obfs2 195.43.157.80:51715,obfs2 128.31.0.34:1051,obfs2 184.73.35.40:8080,obfs2 141.201.27.48:37708</string> +<string name="notification_using_bridges">Bridges enabled!</string> </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 02beff4..15f3abc 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -101,6 +101,7 @@ android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network">< android:title="@string/bridges" android:summary="@string/ip_address_and_port_of_bridges" android:dialogTitle="@string/enter_bridge_addresses" +android:defaultValue="@string/default_bridges" /> </PreferenceCategory>

1 0