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

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

15 Apr '14

commit aeae61134c1d3fccb8c3b5ad505aeabd36ead169 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 15 09:15:37 2014 +0000 Update translations for tails-misc --- hr_HR.po | 110 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 701e811..aff357b 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-04-15 08:45+0000\n" +"PO-Revision-Date: 2014-04-15 09:14+0000\n" "Last-Translator: Miskha <edinaaa.b(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,7 @@ msgstr "Upravljaj ključevima" #: config/chroot_local-includes/usr/local/bin/gpgApplet:244 msgid "The clipboard does not contain valid input data." -msgstr "" +msgstr "Clipboard ne sadrži važeće ulazne podatke. " #: config/chroot_local-includes/usr/local/bin/gpgApplet:294 #: config/chroot_local-includes/usr/local/bin/gpgApplet:296 @@ -88,11 +88,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:302 msgid "Full Trust" -msgstr "" +msgstr "Puno povjerenje" #: config/chroot_local-includes/usr/local/bin/gpgApplet:304 msgid "Ultimate Trust" -msgstr "" +msgstr "Konačno povjerenje" #: config/chroot_local-includes/usr/local/bin/gpgApplet:357 msgid "Name" @@ -100,7 +100,7 @@ msgstr "Naziv" #: config/chroot_local-includes/usr/local/bin/gpgApplet:358 msgid "Key ID" -msgstr "" +msgstr "Identifikacija ključa" #: config/chroot_local-includes/usr/local/bin/gpgApplet:359 msgid "Status" @@ -113,9 +113,9 @@ msgstr "Otisak" #: config/chroot_local-includes/usr/local/bin/gpgApplet:394 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "ID korisnika" +msgstr[1] "ID-i korisnika" +msgstr[2] "ID-i korisnika" #: config/chroot_local-includes/usr/local/bin/gpgApplet:424 msgid "None (Don't sign)" @@ -137,68 +137,68 @@ msgstr "Sakrij identifikaciju svih primaoca kodirane poruke. Inače svako ko vid #: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Sign message as:" -msgstr "" +msgstr "Potpiši poruku kao :" #: config/chroot_local-includes/usr/local/bin/gpgApplet:508 msgid "Choose keys" -msgstr "" +msgstr "Izaberi ključeve " #: config/chroot_local-includes/usr/local/bin/gpgApplet:548 msgid "Do you trust these keys?" -msgstr "" +msgstr "Da li vjeruješ ovim ključevima ? " #: config/chroot_local-includes/usr/local/bin/gpgApplet:551 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Sljedeci izabrani ključ nije potpuno siguran :" +msgstr[1] "Sljedeći izabrani ključevi nisu potpuno sigurni :" +msgstr[2] "Sljedeći izabrani ključevi nisu potpuno sigurni : " #: config/chroot_local-includes/usr/local/bin/gpgApplet:569 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Da li vjeruješ ovom ključu dovoljno da ga svejedno upotrijebiš ? " +msgstr[1] "Da li vjeruješ ovim ključevima dovoljno da ih svejedno upotrijebiš ? " +msgstr[2] "Da li vjerujes ovim ključevima dovoljno da ih svejedno upotrijebiš ? " #: config/chroot_local-includes/usr/local/bin/gpgApplet:582 msgid "No keys selected" -msgstr "" +msgstr "Nijedan ključ nije izabran " #: config/chroot_local-includes/usr/local/bin/gpgApplet:584 msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." -msgstr "" +msgstr "Morate izabrati privatni ključ da biste potpisali poruku , ili neke javne ključeve da biste kodirali poruku ili oboje. " #: config/chroot_local-includes/usr/local/bin/gpgApplet:612 msgid "No keys available" -msgstr "" +msgstr "Nema dostupnih ključeva" #: config/chroot_local-includes/usr/local/bin/gpgApplet:614 msgid "" "You need a private key to sign messages or a public key to encrypt messages." -msgstr "" +msgstr "Trebate privatni ključ da biste potpisali poruke ili javni ključ da biste ih kodirali." #: config/chroot_local-includes/usr/local/bin/gpgApplet:742 msgid "GnuPG error" -msgstr "" +msgstr "GnuPG greška" #: config/chroot_local-includes/usr/local/bin/gpgApplet:763 msgid "Therefore the operation cannot be performed." -msgstr "" +msgstr "Stoga operacija ne može biti izvršena." #: config/chroot_local-includes/usr/local/bin/gpgApplet:813 msgid "GnuPG results" -msgstr "" +msgstr "GnuPG rezultati" #: config/chroot_local-includes/usr/local/bin/gpgApplet:819 msgid "Output of GnuPG:" -msgstr "" +msgstr "Izlazni GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:844 msgid "Other messages provided by GnuPG:" -msgstr "" +msgstr "Druge poruke obezbijeđene od strane GnuPG:" #: config/chroot_local-includes/usr/local/bin/iceweasel:12 msgid "Tor is not ready" @@ -218,15 +218,15 @@ msgstr "Otkaži" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 msgid "Shutdown Immediately" -msgstr "" +msgstr "Ugasiti odmah" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 msgid "Reboot Immediately" -msgstr "" +msgstr "Ponovno podizanje sustava odmah " #: config/chroot_local-includes/usr/local/bin/tails-about:13 msgid "not available" -msgstr "" +msgstr "Nije dostupno" #: config/chroot_local-includes/usr/local/bin/tails-about:16 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 @@ -242,17 +242,17 @@ msgstr "" msgid "" "Build information:\n" "%s" -msgstr "" +msgstr "Izgraditi informacije:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:20 msgid "About Tails" -msgstr "" +msgstr "O Tail-u " #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" -msgstr "" +msgstr "Vaš dodatni softver" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 @@ -264,21 +264,21 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." -msgstr "" +msgstr "Poboljšanje je bilo uspješno." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" -msgstr "" +msgstr "Sikroniziranje sata sistema" #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "" +msgstr "Tor treba tačan sat da bi radio ispravno, posebno za sakrivene usluge. Molimo pričekajte..." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" -msgstr "" +msgstr "Neuspješno sikronizovanje sata ! " #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 msgid "Network connection blocked?" @@ -294,7 +294,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" -msgstr "" +msgstr "Ova verzija Tails-a ima poznate sigurnosne probleme : " #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 #, sh-format @@ -321,33 +321,33 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." -msgstr "" +msgstr "Pokretanje I2P ..." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63 msgid "The I2P router console will be opened on start." -msgstr "" +msgstr "I2P konzola za ruter ce biti otvorena na početku . " #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82 #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124 msgid "I2P failed to start" -msgstr "" +msgstr "I2P nije uspio da se pokrene" #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83 msgid "" "Make sure that you have a working Internet connection, then try to start I2P" " again." -msgstr "" +msgstr "Uvjerite se da imate funkcionalnu internet konekciju ,zatim pokusajte da ponovo pokrenete I2P." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125 msgid "" "Something went wrong when I2P was starting. Look in the logs in the " "following directory for more information:" -msgstr "" +msgstr "Nešto je pošlo naopako pri pokretanju I2P. Pogledajte evidenciju u sljedećem direktoriju za više informacija : " #: 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 "Greška:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 @@ -369,60 +369,60 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" -msgstr "" +msgstr "Upozorenje : Virtualna mašina otkrivena ! " #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." -msgstr "" +msgstr "I domaći operativni sustav i softver za virtualizaciju su u mogućnosti da prate što radite u Tails." #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 msgid "" "<a " "href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn" " more...</a>" -msgstr "" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Nauči više...</a>" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "" +msgstr "Da li sigurno želite da pokrenete nesiguran pretraživač ? " #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." -msgstr "" +msgstr "Aktivnost na mreži prilikom koristenja nesigurnog pretraživača <b>nije anonimna</b> . Koristite nesiguran pretraživač samo ako je to neophodno , na primjer ako se morate prijaviti ili registrovati da aktivirate vašu internet konekciju. " #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "_Launch" -msgstr "" +msgstr "Pokreni" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 msgid "_Exit" -msgstr "" +msgstr "Izlaz" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 msgid "Starting the Unsafe Browser..." -msgstr "" +msgstr "Pokretanje nesigurnog pretraživača..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 msgid "This may take a while, so please be patient." -msgstr "" +msgstr "Ovo može potrajati, molimo Vas za malo strpljenja. " #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:101 msgid "Failed to setup chroot." -msgstr "" +msgstr "Neuspješno postavljanje chroot. " #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" -msgstr "" +msgstr "Nesiguran pretraživač" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 msgid "Shutting down the Unsafe Browser..." -msgstr "" +msgstr "Gašenje nesigurnog pretraživača... " #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 msgid ""

1 0

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

15 Apr '14

commit db44e7f04028011ee50d24aac53dbfd167af3fb5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 15 08:45:35 2014 +0000 Update translations for tails-misc --- hr_HR.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index bad25e3..701e811 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Miskha <edinaaa.b(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-04-04 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-15 08:45+0000\n" +"Last-Translator: Miskha <edinaaa.b(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,11 +42,11 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "" +msgstr "<h1>Pomozite nam da rijesimo vaš kvar !</h1>\n<p>Pročitajte <a href=\"%s\">naše upute za prijavljivanje kvara</a>.</p>\n<p><strong>Nemojte upisati više ličnih informacija nego što je\npotrebno!</strong></p>\n<h2>O davanju vaše email adrese</h2>\n<p>Ako nemate ništa protiv otkrivanja malih dijelova vašeg identiteta\n Tail programerima, možete da nam obezbijedite svoju email adresu\ni dozvolite nam da vas pitamo detalje o kvaru. Dodatni ulazak\njavni PGP ključ omogućava nam da šifriramo takvu buduću\nkomunikaciju.</p>\n<p>Svako ko može da vidi ovaj odgovor će vjerovatno zaključiti da ste\n Tail korisnik. Vrijeme da se zapitate koliko vjerujete vašim \nInternet i mailbox provajderima?</p>\n" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" -msgstr "" +msgstr "Otvori PGP aplet za kodiranje" #: config/chroot_local-includes/usr/local/bin/gpgApplet:139 msgid "Exit" @@ -57,19 +58,19 @@ msgstr "O" #: config/chroot_local-includes/usr/local/bin/gpgApplet:192 msgid "Encrypt Clipboard with _Passphrase" -msgstr "" +msgstr "Šifriraj Clipboard sa lozinkom" #: config/chroot_local-includes/usr/local/bin/gpgApplet:195 msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "" +msgstr "Potpiši/ Šifriraj Clipboard sa Javnim_Ključevima" #: config/chroot_local-includes/usr/local/bin/gpgApplet:200 msgid "_Decrypt/Verify Clipboard" -msgstr "" +msgstr "Dešifruj/ Potvrdi Clipboard" #: config/chroot_local-includes/usr/local/bin/gpgApplet:204 msgid "_Manage Keys" -msgstr "" +msgstr "Upravljaj ključevima" #: config/chroot_local-includes/usr/local/bin/gpgApplet:244 msgid "The clipboard does not contain valid input data." @@ -107,7 +108,7 @@ msgstr "Status" #: config/chroot_local-includes/usr/local/bin/gpgApplet:391 msgid "Fingerprint:" -msgstr "" +msgstr "Otisak" #: config/chroot_local-includes/usr/local/bin/gpgApplet:394 msgid "User ID:" @@ -118,21 +119,21 @@ msgstr[2] "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:424 msgid "None (Don't sign)" -msgstr "" +msgstr "Nijedan (ne prijavljuj) " #: config/chroot_local-includes/usr/local/bin/gpgApplet:487 msgid "Select recipients:" -msgstr "" +msgstr "Izaberi primaoce :" #: config/chroot_local-includes/usr/local/bin/gpgApplet:495 msgid "Hide recipients" -msgstr "" +msgstr "Sakrij sve primaoce" #: config/chroot_local-includes/usr/local/bin/gpgApplet:498 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "" +msgstr "Sakrij identifikaciju svih primaoca kodirane poruke. Inače svako ko vidi kodiranu poruku može da vidi ko su primaoci. " #: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Sign message as:"

1 0

[orbot/master] update UI on rebind of service
by n8fr8＠torproject.org 15 Apr '14

15 Apr '14

commit 4673f04f8b0d63e7f0945d963a0d96e88a1087de Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 00:24:01 2014 -0400 update UI on rebind of service --- src/org/torproject/android/Orbot.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 9bd504b..43a797d 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -594,6 +594,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } + torStatus = -1; updateStatus (""); } @@ -1095,6 +1096,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private ServiceConnection mConnection = new ServiceConnection() { public void onServiceConnected(ComponentName className, IBinder service) { + + mIsBound = true; + // This is called when the connection with the service has been // established, giving us the service object we can use to // interact with the service. We are communicating with our @@ -1151,7 +1155,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic bindService(mTorService, mConnection, Context.BIND_AUTO_CREATE); - mIsBound = true; + }

1 0

[orbot/master] add automapresolve to ensure .onion address are handled
by n8fr8＠torproject.org 15 Apr '14

15 Apr '14

commit 16799ef0c61a7c906a8c877b1b152d9d30cc1c21 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 00:25:06 2014 -0400 add automapresolve to ensure .onion address are handled --- res/raw/torrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/raw/torrc b/res/raw/torrc index 5af3c05..85d6b86 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -11,4 +11,6 @@ TransPort 9040 TransListenAddress 127.0.0.1 DNSPort 5400 DNSListenAddress 127.0.0.1 -AvoidDiskWrites 1 \ No newline at end of file +AvoidDiskWrites 1 +VirtualAddrNetwork 10.192.0.0/10 +AutomapHostsOnResolve 1 \ No newline at end of file

1 0

[orbot/master] connect to "localhost" instead of 127.0.0.1
by n8fr8＠torproject.org 15 Apr '14

15 Apr '14

commit cd8b7e45dbac0e7eec20f3a6c586cefcb08fae9d Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 00:24:17 2014 -0400 connect to "localhost" instead of 127.0.0.1 --- src/org/torproject/android/service/TorServiceConstants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 567d933..98129d9 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -54,7 +54,7 @@ public interface TorServiceConstants { public final static int PORT_SOCKS = 9050; //what is says! - public final static String IP_LOCALHOST = "127.0.0.1"; + public final static String IP_LOCALHOST = "localhost"; public final static int TOR_CONTROL_PORT = 9051; public final static int UPDATE_TIMEOUT = 1000; public final static int TOR_TRANSPROXY_PORT = 9040; @@ -79,7 +79,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.21-openssl1.0.1g-if6"; + public static final String BINARY_TOR_VERSION = "0.2.4.21-openssl1.0.1g-if7"; public static final String BINARY_PRIVOXY_VERSION = "3.0.12"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INSTALLED";

1 0

[orbot/master] fixes for transproxy to fix DNS leaks in some cases
by n8fr8＠torproject.org 15 Apr '14

15 Apr '14

commit c68ce2ce1e0030a0baa43e3a1ef0280ba3d13a61 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 00:22:52 2014 -0400 fixes for transproxy to fix DNS leaks in some cases latest RC was leaking DNS due to updates iptables/xtables binary and need for new iptables rules format --- .../torproject/android/service/TorTransProxy.java | 170 +++++++++++--------- 1 file changed, 95 insertions(+), 75 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index b813ac8..5a11ebf 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -303,12 +303,24 @@ public class TorTransProxy implements TorServiceConstants { logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); + + // Allow loopback + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A ").append(srcChainName); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -o lo"); + script.append(" -j ACCEPT"); + + executeCommand (shell, script.toString()); + script = new StringBuilder(); + // Set up port redirection script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A ").append(srcChainName); script.append(" -p tcp"); - script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -m tcp --syn"); @@ -320,20 +332,23 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); - script.append(" -t nat"); - script.append(" -A ").append(srcChainName); - script.append(" -p udp -m owner --uid-owner "); + script.append(" -t nat"); + script.append(" -A ").append(srcChainName); + script.append(" -p udp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost + script.append(" -m owner ! --uid-owner "); script.append(tApp.getUid()); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); + executeCommand (shell, script.toString()); script = new StringBuilder(); - int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; + int[] ports = {TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) { @@ -341,57 +356,38 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A ").append(srcChainName); + script.append(" -p tcp"); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); - script.append(" -p tcp"); - script.append(" -d 127.0.0.1"); script.append(" --dport "); script.append(port); script.append(" -j ACCEPT"); executeCommand (shell, script.toString()); script = new StringBuilder(); - - } - // Allow loopback + // Allow packets to localhost (contains all the port-redirected ones) script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A ").append(srcChainName); + script.append(" -p udp"); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); - script.append(" -p tcp"); - script.append(" -o lo"); + script.append(" --dport "); + script.append(TOR_DNS_PORT); script.append(" -j ACCEPT"); - - executeCommand (shell, script.toString()); - script = new StringBuilder(); - - // Reject all other outbound TCP packets - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A ").append(srcChainName); - script.append(" -m owner --uid-owner "); - script.append(tApp.getUid()); - script.append(" -p tcp"); - script.append(" ! -d 127.0.0.1"); //allow access to localhost - script.append(" -j REJECT"); - executeCommand (shell, script.toString()); script = new StringBuilder(); - - // Reject all other outbound UDP packets + // Reject all other outbound packets script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A ").append(srcChainName); script.append(" -m owner --uid-owner "); - script.append(tApp.getUid()); - script.append(" -p udp"); - script.append(" ! -d 127.0.0.1"); //allow access to localhost - script.append(" -j REJECT"); + script.append(tApp.getUid()); + script.append(" -j DROP"); lastExit = executeCommand (shell, script.toString()); script = new StringBuilder(); @@ -400,8 +396,6 @@ public class TorTransProxy implements TorServiceConstants { } } - fixTransproxyLeak (context); - shell.close(); return lastExit; @@ -546,8 +540,9 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder script = new StringBuilder(); // Allow everything for Tor + script.append(ipTablesPath); - script.append(" -t filter"); + script.append(" -t nat"); script.append(" -A ").append(srcChainName); script.append(" -m owner --uid-owner "); script.append(torUid); @@ -555,7 +550,17 @@ public class TorTransProxy implements TorServiceConstants { executeCommand (shell, script.toString()); script = new StringBuilder(); + + // Allow loopback + script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A ").append(srcChainName); + script.append(" -o lo"); + script.append(" -j ACCEPT"); + + executeCommand (shell, script.toString()); + script = new StringBuilder(); // Set up port redirection script.append(ipTablesPath); @@ -589,38 +594,6 @@ public class TorTransProxy implements TorServiceConstants { script = new StringBuilder(); - /** - int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; - - for (int port : ports) - { - // Allow packets to localhost (contains all the port-redirected ones) - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A ").append(srcChainName); - script.append(" -m owner ! --uid-owner "); - script.append(torUid); - script.append(" -p tcp"); - script.append(" -d 127.0.0.1"); - script.append(" --dport "); - script.append(port); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - - }**/ - - // Allow loopback - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A ").append(srcChainName); - script.append(" -p tcp"); - script.append(" -o lo"); - script.append(" -j ACCEPT"); - - executeCommand (shell, script.toString()); - script = new StringBuilder(); - - if (TorService.ENABLE_DEBUG_LOG) { //XXX: Comment the following rules for non-debug builds @@ -650,32 +623,79 @@ public class TorTransProxy implements TorServiceConstants { } - // Reject all other outbound TCP packets + //allow access to transproxy port script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A ").append(srcChainName); - script.append(" -m owner ! --uid-owner "); - script.append(torUid); script.append(" -p tcp"); - script.append(" ! -d 127.0.0.1"); //allow access to localhost - script.append(" -j REJECT"); + script.append(" -m tcp"); + script.append(" --dport ").append(TOR_TRANSPROXY_PORT); + script.append(" -j ACCEPT"); + + executeCommand (shell, script.toString()); + script = new StringBuilder(); + + //allow access to local SOCKS port + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A ").append(srcChainName); + script.append(" -p tcp"); + script.append(" -m tcp"); + script.append(" --dport ").append(PORT_SOCKS); + script.append(" -j ACCEPT"); + + executeCommand (shell, script.toString()); + script = new StringBuilder(); + + //allow access to local SOCKS port + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A ").append(srcChainName); + script.append(" -p tcp"); + script.append(" -m tcp"); + script.append(" --dport ").append(PORT_HTTP); + script.append(" -j ACCEPT"); + + executeCommand (shell, script.toString()); + script = new StringBuilder(); + + //allow access to local DNS port + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A ").append(srcChainName); + script.append(" -p udp"); + script.append(" -m udp"); + script.append(" --dport ").append(TOR_DNS_PORT); + script.append(" -j ACCEPT"); executeCommand (shell, script.toString()); script = new StringBuilder(); + //allow access to local DNS port + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A ").append(srcChainName); + script.append(" -p udp"); + script.append(" -m udp"); + script.append(" --dport ").append(TOR_DNS_PORT); + script.append(" -j ACCEPT"); + + executeCommand (shell, script.toString()); + script = new StringBuilder(); + + // Reject all other outbound UDP packets script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A ").append(srcChainName); script.append(" -m owner ! --uid-owner "); script.append(torUid); - script.append(" -p udp"); - script.append(" ! -d 127.0.0.1"); //allow access to localhost - script.append(" -j REJECT"); + script.append(" -j DROP"); int lastExit = executeCommand (shell, script.toString()); fixTransproxyLeak (context); + shell.close(); return lastExit;

1 0

[orbot/master] improve process lookup code
by n8fr8＠torproject.org 15 Apr '14

15 Apr '14

commit 06d5a6fc092062ca507d5702120ed38f406ac00e Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 00:24:55 2014 -0400 improve process lookup code --- src/org/torproject/android/service/TorServiceUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 7b6df59..5e87cb5 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -73,12 +73,12 @@ public class TorServiceUtils implements TorServiceConstants { Process procPs = null; - String processKey = '/' + new File(command).getName(); + String processKey = new File(command).getName(); - procPs = r.exec(SHELL_CMD_PS); + procPs = r.exec(SHELL_CMD_PS + ' ' + processKey); // this is the android ps <name> command BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream())); - String line = null; + String line = reader.readLine(); //read first line "headers" USER PID PPID etc while ((line = reader.readLine())!=null) {

1 0

[orbot/master] bump version to 13.0.6-RC-2
by n8fr8＠torproject.org 15 Apr '14

15 Apr '14

commit fa6c1015d85f9617dc93bf02d2c0d6c8102ffb76 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 00:26:24 2014 -0400 bump version to 13.0.6-RC-2 --- AndroidManifest.xml | 4 ++-- external/jtorctl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2f649dd..7902463 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="13.0.6-RC-1" - android:versionCode="79" + android:versionName="13.0.6-RC-2" + android:versionCode="80" android:installLocation="auto" > diff --git a/external/jtorctl b/external/jtorctl index 3539cbd..319377b 160000 --- a/external/jtorctl +++ b/external/jtorctl @@ -1 +1 @@ -Subproject commit 3539cbd134f48c2c8875c440a4cbe8e15ebca280 +Subproject commit 319377b33117035155715b9207a7b41cbacef3a7

1 0

[orbot/master] improving control port connection code
by n8fr8＠torproject.org 15 Apr '14

15 Apr '14

commit 3824bc56e55dd252dd6fdde95ab24646212a6915 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 00:47:59 2014 -0400 improving control port connection code adding additional logging for problems with Samsungs --- src/org/torproject/android/service/TorService.java | 41 +++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index e8688c2..5298764 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -8,6 +8,7 @@ package org.torproject.android.service; +import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -829,17 +830,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst private int initControlConnection () throws Exception, RuntimeException { - while (conn == null) + int maxAttempts = 5; + int i = 0; + + while (conn == null && i++ < maxAttempts) { try { logNotice( "Connecting to control port: " + TOR_CONTROL_PORT); - torConnSocket = new Socket(IP_LOCALHOST, TOR_CONTROL_PORT); conn = TorControlConnection.getConnection(torConnSocket); - // conn.authenticate(new byte[0]); // See section 3.2 logNotice( "SUCCESS connected to control port"); @@ -848,31 +850,40 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (fileCookie.exists()) { byte[] cookie = new byte[(int)fileCookie.length()]; - new FileInputStream(fileCookie).read(cookie); + DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); + fis.read(cookie); + fis.close(); conn.authenticate(cookie); - logNotice( "SUCCESS authenticated to control port"); + logNotice( "SUCCESS - authenticated to control port"); sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); addEventHandler(); - } - - String torProcId = conn.getInfo("process/pid"); + - return Integer.parseInt(torProcId); + String torProcId = conn.getInfo("process/pid"); + + return Integer.parseInt(torProcId); + + } + else + { + logNotice ("Tor authentication cookie does not exist yet; trying again..."); + } } catch (Exception ce) { conn = null; + logNotice( "Error connecting to Tor local control port: " + ce.getLocalizedMessage()); + Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); - - sendCallbackStatusMessage(getString(R.string.tor_process_waiting)); - - Thread.sleep(3000); - - } + } + + sendCallbackStatusMessage(getString(R.string.tor_process_waiting)); + Thread.sleep(3000); + }

1 0

[orbot/master] small tweaks to Tor binary startup code
by n8fr8＠torproject.org 15 Apr '14

15 Apr '14

commit cc020f54b6cb4ab0ccd974009b38eddb86da194d Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 00:25:28 2014 -0400 small tweaks to Tor binary startup code --- src/org/torproject/android/service/TorService.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 52e4061..e8688c2 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -734,16 +734,24 @@ public class TorService extends Service implements TorServiceConstants, TorConst int torRetryWaitTimeMS = 1000; - ArrayList<String> alEnv = new ArrayList<String>(); - alEnv.add("HOME=" + appBinHome.getAbsolutePath()); - sendCallbackStatusMessage(getString(R.string.status_starting_up)); + //start Tor in the background + ArrayList<String> alEnv = new ArrayList<String>(); + alEnv.add("HOME=" + appBinHome.getAbsolutePath()); Shell shell = Shell.startShell(alEnv,appBinHome.getAbsolutePath()); - SimpleCommand cmdTor = new SimpleCommand(fileTor.getAbsolutePath() + " DataDirectory " + appCacheHome.getAbsolutePath() + " -f " + torrcPath + "&"); + SimpleCommand cmdTor = new SimpleCommand(fileTor.getAbsolutePath() + " DataDirectory " + appCacheHome.getAbsolutePath() + " -f " + torrcPath + " &"); shell.add(cmdTor); + + if (TorService.ENABLE_DEBUG_LOG) + { + logNotice("Tor exit code=" + cmdTor.getExitCode() + ";output=" + cmdTor.getOutput()); + } + + //wait a few seconds Thread.sleep(torRetryWaitTimeMS); + //now try to connect procId = initControlConnection (); shell.close();

1 0