August 2014 - tor-commits - lists.torproject.org

[orbot/master] update to 14.0.7.2
by n8fr8＠torproject.org 26 Aug '14

26 Aug '14

commit d2c71d7268470e8474c5bd1404c2bf34b54fb333 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 26 23:14:17 2014 -0400 update to 14.0.7.2 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2146b4a..7841cf8 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="14.0.7.1" - android:versionCode="120" + android:versionName="14.0.7.2" + android:versionCode="121" android:installLocation="auto" >

1 0

[orbot/master] update change log
by n8fr8＠torproject.org 26 Aug '14

26 Aug '14

commit 9879b53932719946af2f97d22f7ede1fb0bdf4ca Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 26 23:15:27 2014 -0400 update change log --- CHANGELOG | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c48a798..12af565 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,32 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +d2c71d7 update to 14.0.7.2 +6e65469 ensure settings are updated and binary paths are on service restart +af433d3 remove unused variables/patterns +b76be6d disable stdout log by default and enable daemon mode +dafd295 simplify process reconnect and transproxy setup - on reconnect to service, don't require call to getInfo before STATUS_ON is s +390b89e remove debug file logging for now until we can improve it +e53e03a tuning Orbot app conflict checker code + +c2672cc update to 14.0.7.1 +eaccf77 don't call handle intents twice! + +24a3db8 update to 14.0.7 +add04f2 exit menu option should be a menu +186e74b add new transproxy flush pref and strings +c78a822 add transproxy flush option to settings +68495c3 make delete iptables rules process match add for specific behavior no more drop all output tables, etc +25bc4c0 add new flush transproxy interface method +79a32e6 make sure control connection is not null on rebind - also tune app conflict checker code for Samsung Link +b307d51 make default SOCKs port auto, and THEN try to set specified port - also remove exit IP lookup loop bad code +9cc5f98 don't obfuscate class names; we just need to remove unused classes +3698e46 create new thread for connecting to existing process don't rely on executor yet, as we need it to happen fast +ea37b44 create new thread to just for existing process dont' rely on executor there yet +3a82421 no need for asynctask - just grab the status directly +e2f4f5f don't make these final, because the user might change them +7d243af update changelog + +56dfff0 bumped to 14.0.6 05dd331 update to latest jtorctl with patches for thread, error handling 73d4297 bump to 14.0.5.4

1 0

[orbot/master] ensure settings are updated and binary paths are on service restart
by n8fr8＠torproject.org 26 Aug '14

26 Aug '14

commit 6e6546972a6adedb72a90333eb9fe12ab87aa41f Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Aug 26 23:01:46 2014 -0400 ensure settings are updated and binary paths are on service restart --- src/org/torproject/android/service/TorService.java | 43 +++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index af41960..8a43dba 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -340,6 +340,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { + + if (fileTor == null) + initBinariesAndDirectories(); + + updateSettings (); + mExecutor.execute (new TorStarter(intent)); return Service.START_STICKY; @@ -568,6 +574,24 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { initBinariesAndDirectories(); + updateSettings(); + + new Thread(new Runnable () + { + public void run () + { + try + { + findExistingProc (); + } + catch (Exception e) + { + Log.e(TAG,"error onBind",e); + } + + } + }).start(); + } catch (Exception e) { @@ -576,21 +600,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice("There was an error installing Orbot binaries"); } - new Thread(new Runnable () - { - public void run () - { - try - { - findExistingProc (); - } - catch (Exception e) - { - Log.e(TAG,"error onBind",e); - } - - } - }).start(); } @@ -712,6 +721,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void updateSettings () throws TimeoutException, IOException { + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); mHasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); @@ -736,6 +746,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst currentStatus = STATUS_CONNECTING; + if (fileTor == null) + initBinariesAndDirectories(); + enableBinExec(fileTor); enableBinExec(filePolipo); enableBinExec(fileObfsclient);

1 0

[orbot/master] remove debug file logging for now until we can improve it
by n8fr8＠torproject.org 26 Aug '14

26 Aug '14

commit 390b89ed5796e7c514bd15517787bd741cc72768 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Aug 22 11:10:47 2014 -0400 remove debug file logging for now until we can improve it --- src/org/torproject/android/service/TorService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 6709cad..4ed89f9 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1048,13 +1048,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst String torProcId = conn.getInfo("process/pid"); + //remove this for now until we can make a clean way to share logs from internal storage + /** if (ENABLE_DEBUG_LOG) { File fileLog2 = new File(getFilesDir(),"orbot-tor-log.txt"); fileLog2.setReadable(true); conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); - } + }*/ currentStatus = STATUS_CONNECTING;

1 0

[orbot/master] tuning Orbot app conflict checker code
by n8fr8＠torproject.org 26 Aug '14

26 Aug '14

commit e53e03a7277f1b54c664eb5a4c994871c67d45c1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Aug 22 11:09:11 2014 -0400 tuning Orbot app conflict checker code --- src/org/torproject/android/Orbot.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index d603d89..e88e14d 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -296,13 +296,13 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { SharedPreferences sprefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - boolean showAppConflict = sprefs.getBoolean("pref_show_conflict",true); + boolean showAppConflict = true;//sprefs.getBoolean("pref_show_conflict",true); - String[] badApps = {"com.sec.msc.nts.android.proxy|com.sec.msc.nts.android.proxy","com.sec.pcw|Samsung Link"}; + String[] badApps = {"com.sec.msc.nts.android.proxy:com.sec.msc.nts.android.proxy","com.sec.pcw:Samsung Link"}; for (String badApp : badApps) { - String[] badAppParts = badApp.split("|"); + String[] badAppParts = badApp.split(":"); if (appInstalledOrNot(badAppParts[0])) { @@ -742,7 +742,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic PackageManager pm = getPackageManager(); try { - PackageInfo pi = pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); + PackageInfo pi = pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); return pi.applicationInfo.enabled; } catch (PackageManager.NameNotFoundException e)

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit 461805c0703e59ccbed1afe2e4c8a3450046c66f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 23:46:04 2014 +0000 Update translations for tails-iuk --- nn.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nn.po b/nn.po index 969e320..a3cc4bb 100644 --- a/nn.po +++ b/nn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-06-24 11:44+0200\n" -"PO-Revision-Date: 2014-08-02 10:31+0000\n" +"PO-Revision-Date: 2014-08-26 23:31+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:255 msgid "not enough memory is available on this system" -msgstr "" +msgstr "ikkje nok minne tilgjengeleg på dette systemet" #: ../lib/Tails/IUK/Frontend.pm:261 #, perl-brace-format @@ -63,7 +63,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:281 msgid "The system is up-to-date" -msgstr "" +msgstr "Systemet er oppdatert" #: ../lib/Tails/IUK/Frontend.pm:286 msgid "This version of Tails is outdated, and may have security issues." @@ -111,7 +111,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" -msgstr "" +msgstr "Oppgradering tilgjengeleg" #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade now" @@ -135,11 +135,11 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available" -msgstr "" +msgstr "Ny versjon tilgjengeleg" #: ../lib/Tails/IUK/Frontend.pm:468 msgid "Downloading upgrade" -msgstr "" +msgstr "Lastar ned oppgradering" #: ../lib/Tails/IUK/Frontend.pm:471 #, perl-brace-format @@ -189,11 +189,11 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:580 msgid "Restart now" -msgstr "" +msgstr "Start på nytt no" #: ../lib/Tails/IUK/Frontend.pm:581 msgid "Restart later" -msgstr "" +msgstr "Start på nytt seinare" #: ../lib/Tails/IUK/Frontend.pm:592 msgid "Error while restarting the system"

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit f1d012ca89a25e5d27c1e9a058f165907538fdb5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 23:45:52 2014 +0000 Update translations for abouttor-homepage --- nn/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nn/aboutTor.dtd b/nn/aboutTor.dtd index c34b086..6b1f073 100644 --- a/nn/aboutTor.dtd +++ b/nn/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "MEN, denne nettlesaren er utdatert."> <!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> <!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> @@ -34,7 +34,7 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> <!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> +<!ENTITY aboutTor.helpInfo1.label "Du kan hjelpa til!"> <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> <!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit 4d9d2262eb5a08817766cbf91738c9911086a0f0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 23:45:48 2014 +0000 Update translations for tails-misc --- nn.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nn.po b/nn.po index 468f0f8..c8f7fd9 100644 --- a/nn.po +++ b/nn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-21 01:59+0200\n" -"PO-Revision-Date: 2014-08-13 17:50+0000\n" +"PO-Revision-Date: 2014-08-26 23:31+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" @@ -126,7 +126,7 @@ msgstr "Vel mottakarar:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:495 msgid "Hide recipients" -msgstr "" +msgstr "Gøym mottakarar" #: config/chroot_local-includes/usr/local/bin/gpgApplet:498 msgid "" @@ -199,7 +199,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/iceweasel:12 msgid "Tor is not ready" -msgstr "" +msgstr "Tor er ikkje klar" #: config/chroot_local-includes/usr/local/bin/iceweasel:13 msgid "Tor is not ready. Start Tor Browser anyway?" @@ -207,7 +207,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/iceweasel:14 msgid "Start Tor Browser" -msgstr "" +msgstr "Start Tor-nettlesaren" #: config/chroot_local-includes/usr/local/bin/iceweasel:15 msgid "Cancel" @@ -223,7 +223,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" -msgstr "" +msgstr "ikkje tilgjengeleg" #: config/chroot_local-includes/usr/local/bin/tails-about:19 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 @@ -345,7 +345,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "error:" -msgstr "" +msgstr "feil:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit c2a91945c2cde7df9b4601783eec82d2e87e324b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 23:45:45 2014 +0000 Update translations for tor-launcher-network-settings --- nn/network-settings.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nn/network-settings.dtd b/nn/network-settings.dtd index 75a36e0..1c08fa2 100644 --- a/nn/network-settings.dtd +++ b/nn/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor nettverksinnstillingar">  @@ -11,14 +11,14 @@ <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Eg vil kopla til direkte til Tor-nettverket."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Kopla til"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.enterProxy "Skriv inn mellomtenarinnstillingane."> <!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> <!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> @@ -31,12 +31,12 @@ <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> <!ENTITY torsettings.restartTor "Start Tor på nytt"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Valfritt"> <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Mellomtenartype:"> <!ENTITY torsettings.useProxy.address "Addresse:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller vertsnamn"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Brukarnamn:"> <!ENTITY torsettings.useProxy.password "Passord:">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit 519986341f0c51fc2b6edaa68f17cf65059a1b89 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 23:45:40 2014 +0000 Update translations for tor-launcher-properties --- nn/torlauncher.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nn/torlauncher.properties b/nn/torlauncher.properties index eb7fcfd..0404b02 100644 --- a/nn/torlauncher.properties +++ b/nn/torlauncher.properties @@ -13,7 +13,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. +torlauncher.torrc_missing=torrc-fila manglar torlauncher.datadir_missing=The Tor data directory does not exist. torlauncher.password_hash_missing=Failed to get hashed password. @@ -31,11 +31,11 @@ torlauncher.recommended_bridge=(tilrådd) torlauncher.connect=Kople til torlauncher.restart_tor=Start Tor på nytt -torlauncher.quit=Quit +torlauncher.quit=Avslutt torlauncher.quit_win=Avslutt torlauncher.done=Done -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=For hjelp, kontakt %S torlauncher.copiedNLogMessages=Copy complete. %S tor log messages are ready to be pasted into a text editor or an email message. @@ -51,7 +51,7 @@ torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Kopla til Tor-nettverket! torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused +torlauncher.bootstrapWarning.connectrefused=tilkopling avslått torlauncher.bootstrapWarning.misc=miscellaneous torlauncher.bootstrapWarning.resourcelimit=insufficient resources torlauncher.bootstrapWarning.identity=identity mismatch

1 0