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

[translation/orbot] Update translations for orbot
by translation＠torproject.org 15 Jan '14

15 Jan '14

commit f1e9f6f394b683d0b60495ddcff0e9c81a8f60b6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 05:45:07 2014 +0000 Update translations for orbot --- values-ta/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/values-ta/strings.xml b/values-ta/strings.xml index 9928063..d55e23a 100644 --- a/values-ta/strings.xml +++ b/values-ta/strings.xml @@ -1,6 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="menu_info">உதவி</string> + <string name="menu_start">தொடங்கு</string> <string name="button_help">உதவி</string> <string name="button_close">மூடவும்</string> <string name="menu_exit">வெளியேறு</string>

1 0

[orbot/master] 13.0.4a fix for Tor link setup
by n8fr8＠torproject.org 15 Jan '14

15 Jan '14

commit c3327d7ae8e3681f0aac3bba682861a4560ce78e Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 15 00:34:32 2014 -0500 13.0.4a fix for Tor link setup --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 237d32e..2831b35 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.4" - android:versionCode="68" + android:versionName="13.0.4a" + android:versionCode="69" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

[orbot/master] updated TorBinaryInstaller now just handles resources
by n8fr8＠torproject.org 15 Jan '14

15 Jan '14

commit cac2a28d50079edc2f03c35fa9ce32eb91d620a6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Jan 14 23:58:54 2014 -0500 updated TorBinaryInstaller now just handles resources --- .../android/service/TorResourceInstaller.java | 226 ++++++++++++++++++++ 1 file changed, 226 insertions(+) diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java new file mode 100644 index 0000000..ce30da6 --- /dev/null +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -0,0 +1,226 @@ +/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */ +/* See LICENSE for licensing information */ + +package org.torproject.android.service; + +import java.io.BufferedReader; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +import org.torproject.android.R; +import org.torproject.android.TorConstants; + +import android.content.Context; +import android.util.Log; + +public class TorResourceInstaller implements TorServiceConstants { + + + File installFolder; + Context context; + + public TorResourceInstaller (Context context, File installFolder) + { + this.installFolder = installFolder; + + this.context = context; + } + + // + /* + * Extract the Tor resources from the APK file using ZIP + */ + public boolean installResources () throws IOException, FileNotFoundException + { + + InputStream is; + File outFile; + + is = context.getResources().openRawResource(R.raw.torrc); + outFile = new File(installFolder, TORRC_ASSET_KEY); + streamToFile(is,outFile, false, false); + + is = context.getResources().openRawResource(R.raw.torrctether); + outFile = new File(installFolder, TORRC_TETHER_KEY); + streamToFile(is, outFile, false, false); + + is = context.getResources().openRawResource(R.raw.privoxy_config); + outFile = new File(installFolder, PRIVOXYCONFIG_ASSET_KEY); + streamToFile(is,outFile, false, false); + + return true; + } + + /* + * Extract the Tor binary from the APK file using ZIP + */ + + public boolean installGeoIP () throws IOException, FileNotFoundException + { + + InputStream is; + File outFile; + + is = context.getResources().openRawResource(R.raw.geoip); + outFile = new File(installFolder, GEOIP_ASSET_KEY); + streamToFile(is, outFile, false, true); + + is = context.getResources().openRawResource(R.raw.geoip6); + outFile = new File(installFolder, GEOIP6_ASSET_KEY); + streamToFile(is, outFile, false, true); + + return true; + } + + /* + private static void copyAssetFile(Context ctx, String asset, File file) throws IOException, InterruptedException + { + + DataOutputStream out = new DataOutputStream(new FileOutputStream(file)); + InputStream is = new GZIPInputStream(ctx.getAssets().open(asset)); + + byte buf[] = new byte[8172]; + int len; + while ((len = is.read(buf)) > 0) { + out.write(buf, 0, len); + } + out.close(); + is.close(); + }*/ + + /* + * Write the inputstream contents to the file + */ + private static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException + + { + byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE]; + + int bytecount; + + + OutputStream stmOut = new FileOutputStream(outFile, append); + ZipInputStream zis = null; + + if (zip) + { + zis = new ZipInputStream(stm); + ZipEntry ze = zis.getNextEntry(); + stm = zis; + + } + + while ((bytecount = stm.read(buffer)) > 0) + { + + stmOut.write(buffer, 0, bytecount); + + } + + stmOut.close(); + stm.close(); + + if (zis != null) + zis.close(); + + + return true; + + } + + //copy the file from inputstream to File output - alternative impl + public void copyFile (InputStream is, File outputFile) + { + + try { + outputFile.createNewFile(); + DataOutputStream out = new DataOutputStream(new FileOutputStream(outputFile)); + DataInputStream in = new DataInputStream(is); + + int b = -1; + byte[] data = new byte[1024]; + + while ((b = in.read(data)) != -1) { + out.write(data); + } + + if (b == -1); //rejoice + + // + out.flush(); + out.close(); + in.close(); + // chmod? + + + + } catch (IOException ex) { + Log.e(TorConstants.TAG, "error copying binary", ex); + } + + } + + + + + /** + * Copies a raw resource file, given its ID to the given location + * @param ctx context + * @param resid resource id + * @param file destination file + * @param mode file permissions (E.g.: "755") + * @throws IOException on error + * @throws InterruptedException when interrupted + */ + private static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException + { + final String abspath = file.getAbsolutePath(); + // Write the iptables binary + final FileOutputStream out = new FileOutputStream(file); + InputStream is = ctx.getResources().openRawResource(resid); + + if (isZipd) + { + ZipInputStream zis = new ZipInputStream(is); + ZipEntry ze = zis.getNextEntry(); + is = zis; + } + + byte buf[] = new byte[1024]; + int len; + while ((len = is.read(buf)) > 0) { + out.write(buf, 0, len); + } + out.close(); + is.close(); + // Change the permissions + Runtime.getRuntime().exec("chmod "+mode+" "+abspath).waitFor(); + } + /** + * Asserts that the binary files are installed in the bin directory. + * @param ctx context + * @param showErrors indicates if errors should be alerted + * @return false if the binary files could not be installed + */ + /* + public static boolean assertIpTablesBinaries(Context ctx, boolean showErrors) throws Exception { + boolean changed = false; + + // Check iptables_g1 + File file = new File(ctx.getDir("bin",0), "iptables"); + copyRawFile(ctx, R.raw.iptables, file, CHMOD_EXEC, false); + + return true; + }*/ + + +}

1 0

[orbot/master] make sure Tor path link is cleanly setup and chmod'd
by n8fr8＠torproject.org 15 Jan '14

15 Jan '14

commit 3b9d6c8eaa95df6f8befb86e290a31619df9a858 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 15 00:33:51 2014 -0500 make sure Tor path link is cleanly setup and chmod'd --- src/org/torproject/android/service/TorService.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 345737c..fd02121 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -512,22 +512,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst else { + StringBuilder log = new StringBuilder(); + String[] cmdDel = { SHELL_CMD_RM + ' ' + fileTorLink.getAbsolutePath() }; + int errCode = TorServiceUtils.doShellCommand(cmdDel,log, false, true); + logNotice("link RM err=" + errCode + " out: " + log.toString()); - if (fileTorLink.exists()) - { - StringBuilder log = new StringBuilder(); - String[] cmdDel = { "rm " + fileTorLink.getAbsolutePath() }; - int errCode = TorServiceUtils.doShellCommand(cmdDel,log, false, true); - logNotice("link RM err=" + errCode + " out: " + log.toString()); - } - - StringBuilder log = new StringBuilder(); + log = new StringBuilder(); String[] cmd = { SHELL_CMD_LINK + ' ' + fileTorOrig.getAbsolutePath() + ' ' + fileTorLink.getAbsolutePath() }; - int errCode = TorServiceUtils.doShellCommand(cmd,log, false, true); + errCode = TorServiceUtils.doShellCommand(cmd,log, false, true); logNotice("link LN err=" + errCode + " out: " + log.toString()); enableBinExec(fileTorOrig); - + enableBinExec(fileTorLink); enableBinExec(filePrivoxy); enableBinExec(fileObfsProxy); enableBinExec(fileXtables);

1 0

[orbot/master] bump to 13.0.4
by n8fr8＠torproject.org 15 Jan '14

15 Jan '14

commit e55f724b000964565c693fd579378d9411ed9736 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 15 00:01:10 2014 -0500 bump to 13.0.4 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c50d8ab..237d32e 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.3" - android:versionCode="67" + android:versionName="13.0.4" + android:versionCode="68" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

[orbot/master] fix xtables installation and permission setting
by n8fr8＠torproject.org 15 Jan '14

15 Jan '14

commit f538930b7cacf3b08b61a2f96ae4090a4b963bf4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Jan 14 23:57:20 2014 -0500 fix xtables installation and permission setting more fixes for running from sdcard --- .../android/service/TorBinaryInstaller.java | 255 -------------------- src/org/torproject/android/service/TorService.java | 79 +++--- .../torproject/android/service/TorTransProxy.java | 8 +- 3 files changed, 54 insertions(+), 288 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java deleted file mode 100644 index 3ff0a38..0000000 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ /dev/null @@ -1,255 +0,0 @@ -/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */ -/* See LICENSE for licensing information */ - -package org.torproject.android.service; - -import java.io.BufferedReader; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -import org.torproject.android.R; -import org.torproject.android.TorConstants; - -import android.content.Context; -import android.util.Log; - -public class TorBinaryInstaller implements TorServiceConstants { - - - File installFolder; - Context context; - - private static int isARMv6 = -1; - private static String CHMOD_EXEC = "700"; - - public TorBinaryInstaller (Context context, File installFolder) - { - this.installFolder = installFolder; - - this.context = context; - } - - // - /* - * Extract the Tor binary from the APK file using ZIP - */ - public boolean installResources () throws IOException, FileNotFoundException - { - - InputStream is; - File outFile; - - is = context.getResources().openRawResource(R.raw.torrc); - outFile = new File(installFolder, TORRC_ASSET_KEY); - streamToFile(is,outFile, false, false); - - is = context.getResources().openRawResource(R.raw.torrctether); - outFile = new File(installFolder, TORRC_TETHER_KEY); - streamToFile(is, outFile, false, false); - - is = context.getResources().openRawResource(R.raw.privoxy_config); - outFile = new File(installFolder, PRIVOXYCONFIG_ASSET_KEY); - streamToFile(is,outFile, false, false); - - return true; - } - - /* - * Extract the Tor binary from the APK file using ZIP - */ - - public boolean installGeoIP () throws IOException, FileNotFoundException - { - - InputStream is; - File outFile; - - is = context.getResources().openRawResource(R.raw.geoip); - outFile = new File(installFolder, GEOIP_ASSET_KEY); - streamToFile(is, outFile, false, true); - - is = context.getResources().openRawResource(R.raw.geoip6); - outFile = new File(installFolder, GEOIP6_ASSET_KEY); - streamToFile(is, outFile, false, true); - - return true; - } - - /* - private static void copyAssetFile(Context ctx, String asset, File file) throws IOException, InterruptedException - { - - DataOutputStream out = new DataOutputStream(new FileOutputStream(file)); - InputStream is = new GZIPInputStream(ctx.getAssets().open(asset)); - - byte buf[] = new byte[8172]; - int len; - while ((len = is.read(buf)) > 0) { - out.write(buf, 0, len); - } - out.close(); - is.close(); - }*/ - - /* - * Write the inputstream contents to the file - */ - private static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException - - { - byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE]; - - int bytecount; - - - OutputStream stmOut = new FileOutputStream(outFile, append); - ZipInputStream zis = null; - - if (zip) - { - zis = new ZipInputStream(stm); - ZipEntry ze = zis.getNextEntry(); - stm = zis; - - } - - while ((bytecount = stm.read(buffer)) > 0) - { - - stmOut.write(buffer, 0, bytecount); - - } - - stmOut.close(); - stm.close(); - - if (zis != null) - zis.close(); - - - return true; - - } - - //copy the file from inputstream to File output - alternative impl - public void copyFile (InputStream is, File outputFile) - { - - try { - outputFile.createNewFile(); - DataOutputStream out = new DataOutputStream(new FileOutputStream(outputFile)); - DataInputStream in = new DataInputStream(is); - - int b = -1; - byte[] data = new byte[1024]; - - while ((b = in.read(data)) != -1) { - out.write(data); - } - - if (b == -1); //rejoice - - // - out.flush(); - out.close(); - in.close(); - // chmod? - - - - } catch (IOException ex) { - Log.e(TorConstants.TAG, "error copying binary", ex); - } - - } - - - - /** - * Check if this is an ARMv6 device - * @return true if this is ARMv6 - */ - private static boolean isARMv6() { - if (isARMv6 == -1) { - BufferedReader r = null; - try { - isARMv6 = 0; - r = new BufferedReader(new FileReader("/proc/cpuinfo")); - for (String line = r.readLine(); line != null; line = r.readLine()) { - if (line.startsWith("Processor") && line.contains("ARMv6")) { - isARMv6 = 1; - break; - } else if (line.startsWith("CPU architecture") && (line.contains("6TE") || line.contains("5TE"))) { - isARMv6 = 1; - break; - } - } - } catch (Exception ex) { - } finally { - if (r != null) try {r.close();} catch (Exception ex) {} - } - } - return (isARMv6 == 1); - } - - /** - * Copies a raw resource file, given its ID to the given location - * @param ctx context - * @param resid resource id - * @param file destination file - * @param mode file permissions (E.g.: "755") - * @throws IOException on error - * @throws InterruptedException when interrupted - */ - private static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException - { - final String abspath = file.getAbsolutePath(); - // Write the iptables binary - final FileOutputStream out = new FileOutputStream(file); - InputStream is = ctx.getResources().openRawResource(resid); - - if (isZipd) - { - ZipInputStream zis = new ZipInputStream(is); - ZipEntry ze = zis.getNextEntry(); - is = zis; - } - - byte buf[] = new byte[1024]; - int len; - while ((len = is.read(buf)) > 0) { - out.write(buf, 0, len); - } - out.close(); - is.close(); - // Change the permissions - Runtime.getRuntime().exec("chmod "+mode+" "+abspath).waitFor(); - } - /** - * Asserts that the binary files are installed in the bin directory. - * @param ctx context - * @param showErrors indicates if errors should be alerted - * @return false if the binary files could not be installed - */ - /* - public static boolean assertIpTablesBinaries(Context ctx, boolean showErrors) throws Exception { - boolean changed = false; - - // Check iptables_g1 - File file = new File(ctx.getDir("bin",0), "iptables"); - copyRawFile(ctx, R.raw.iptables, file, CHMOD_EXEC, false); - - return true; - }*/ - - -} diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 40976aa..345737c 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -87,6 +87,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private File filePrivoxy; private File fileObfsProxy; + private File fileXtables; + private File fileTorRc; private TorTransProxy mTransProxy; @@ -389,30 +391,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - - /* - public void reloadConfig () - { - try - { - if (conn == null) - { - initControlConnection (); - } - - if (conn != null) - { - conn.signal("RELOAD"); - } - } - catch (Exception e) - { - Log.d(TAG,"Unable to reload configuration",e); - } - }*/ - - - private String getHiddenServiceHostname () { @@ -467,16 +445,27 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (!fileTorLink.exists()||(fileTorOrig.length()!=fileTorLink.length())) { - String[] cmd = { SHELL_CMD_CP + ' ' + fileTorOrig.getAbsolutePath() + ' ' + fileTorLink.getAbsolutePath() }; + log = new StringBuilder(); + String[] cmd = { SHELL_CMD_RM + ' ' + fileTorLink.getAbsolutePath() }; errCode = TorServiceUtils.doShellCommand(cmd,log, false, true); logNotice("link CP err=" + errCode + " out: " + log.toString()); + + log = new StringBuilder(); + String[] cmd1 = { SHELL_CMD_CP + ' ' + fileTorOrig.getAbsolutePath() + ' ' + fileTorLink.getAbsolutePath() }; + errCode = TorServiceUtils.doShellCommand(cmd1,log, false, true); + logNotice("link CP err=" + errCode + " out: " + log.toString()); } enableBinExec(fileTorLink); - log = new StringBuilder(); File filePrivoxyLink = new File(appBinHome,"privoxy"); if (!filePrivoxyLink.exists()||(filePrivoxy.length()!=filePrivoxyLink.length())) { + log = new StringBuilder(); + String[] cmd = { SHELL_CMD_RM + ' ' + filePrivoxyLink.getAbsolutePath() }; + errCode = TorServiceUtils.doShellCommand(cmd,log, false, true); + logNotice("link CP err=" + errCode + " out: " + log.toString()); + + log = new StringBuilder(); String[] cmd1 = { SHELL_CMD_CP + ' ' + filePrivoxy.getAbsolutePath() + ' ' + filePrivoxyLink.getAbsolutePath() }; errCode = TorServiceUtils.doShellCommand(cmd1,log, false, true); logNotice("link CP err=" + errCode + " out: " + log.toString()); @@ -484,10 +473,17 @@ public class TorService extends Service implements TorServiceConstants, TorConst filePrivoxy = filePrivoxyLink; enableBinExec(filePrivoxy); - log = new StringBuilder(); File fileObfsProxyLink = new File(appBinHome,"obfsproxy"); if (!fileObfsProxyLink.exists()||(fileObfsProxy.length()!=fileObfsProxyLink.length())) { + + log = new StringBuilder(); + String[] cmd1 = { SHELL_CMD_RM + ' ' + fileObfsProxyLink.getAbsolutePath() }; + errCode = TorServiceUtils.doShellCommand(cmd1,log, false, true); + logNotice("link CP err=" + errCode + " out: " + log.toString()); + + + log = new StringBuilder(); String[] cmd2 = { SHELL_CMD_CP + ' ' + fileObfsProxy.getAbsolutePath() + ' ' + fileObfsProxyLink.getAbsolutePath() }; errCode = TorServiceUtils.doShellCommand(cmd2,log, false, true); logNotice("link CP err=" + errCode + " out: " + log.toString()); @@ -495,6 +491,23 @@ public class TorService extends Service implements TorServiceConstants, TorConst fileObfsProxy = fileObfsProxyLink; enableBinExec(fileObfsProxy); + + File fileXtablesLink = new File(appBinHome,"xtables"); + if (!fileXtablesLink.exists()||(fileXtables.length()!=fileXtablesLink.length())) + { + log = new StringBuilder(); + String[] cmd1 = { SHELL_CMD_RM + ' ' + fileXtablesLink.getAbsolutePath() }; + errCode = TorServiceUtils.doShellCommand(cmd1,log, false, true); + logNotice("link CP err=" + errCode + " out: " + log.toString()); + + log = new StringBuilder(); + String[] cmd2 = { SHELL_CMD_CP + ' ' + fileXtables.getAbsolutePath() + ' ' + fileXtablesLink.getAbsolutePath() }; + errCode = TorServiceUtils.doShellCommand(cmd2,log, false, true); + logNotice("link CP err=" + errCode + " out: " + log.toString()); + } + fileXtables = fileXtablesLink; + enableBinExec(fileXtables); + } else { @@ -517,6 +530,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst enableBinExec(filePrivoxy); enableBinExec(fileObfsProxy); + enableBinExec(fileXtables); } @@ -643,11 +657,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (!fileTorRc.exists()) { - TorBinaryInstaller installer = new TorBinaryInstaller(this, appBinHome); + TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); boolean success = installer.installResources(); } + fileXtables = new File(appLibsHome, IPTABLES_BINARY_ASSET_KEY); + if (fileXtables.exists()) + logNotice("Xtables binary exists: " + fileXtables.getAbsolutePath()); + initTorPathLinkAndPerms(); } @@ -717,7 +735,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst { if (mTransProxy == null) + { mTransProxy = new TorTransProxy(this); + mTransProxy.setXTables(fileXtables); + } logMessage ("Transparent Proxying: enabling..."); @@ -1697,7 +1718,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { if ((!fileGeoIP.exists())) { - TorBinaryInstaller installer = new TorBinaryInstaller(this, appBinHome); + TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); boolean success = installer.installGeoIP(); } diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 7760d92..04400ac 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -16,14 +16,16 @@ public class TorTransProxy implements TorServiceConstants { private boolean useSystemIpTables = false; private String mSysIptables = null; private TorService mTorService = null; + private File mFileXtables = null; public TorTransProxy (TorService torService) { mTorService = torService; } - public TorTransProxy () + public void setXTables (File fileXTables) { + mFileXtables = fileXTables; } public String getIpTablesPath (Context context) @@ -41,9 +43,7 @@ public class TorTransProxy implements TorServiceConstants { } else { - //use the bundled version - File appLibsHome = new File(context.getApplicationInfo().nativeLibraryDir); - ipTablesPath = new File(appLibsHome,IPTABLES_BINARY_ASSET_KEY).getAbsolutePath(); + ipTablesPath = mFileXtables.getAbsolutePath(); ipTablesPath += " iptables"; //append subcommand since we are using xtables now }

1 0

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

15 Jan '14

commit 980de9534697023e1b3984dc98a02e7be896fcd8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 05:16:12 2014 +0000 Update translations for tails-greeter --- ta/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ta/ta.po b/ta/ta.po index 8cf816e..8fe7349 100644 --- a/ta/ta.po +++ b/ta/ta.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-10 12:01+0100\n" -"PO-Revision-Date: 2014-01-15 04:46+0000\n" +"PO-Revision-Date: 2014-01-15 04:50+0000\n" "Last-Translator: jskcse4 <jskcse4(a)gmail.com>\n" "Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n" "MIME-Version: 1.0\n"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 15 Jan '14

15 Jan '14

commit 462236513101fd32a402caecc7dd38f91fef16df Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 05:16:06 2014 +0000 Update translations for https_everywhere_completed --- pt_BR/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd index 5fe5b93..28c0de7 100644 --- a/pt_BR/ssl-observatory.dtd +++ b/pt_BR/ssl-observatory.dtd @@ -29,7 +29,7 @@ to turn it on?">--> "Submeter e verificar os certificados assinados pelas non-standard root CAs"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -"É seguro (e uma boa idéia) habilitar esta opção, a não ser que você utilize uma rede corporativa intrusiva ou o antivírus Kapersky, que monitora a sua navegação com um proxy TLS e um certificado Certificate Authority cuja raiz é privada. Se habilitada em uma rede deste tipo, esta opção pode publicar provas de quais domínios https:// foram visitados através daquele proxy, por causa dos certificados únicos que seriam produzidos. Por isso, como padrão, nós a desabilitamos."> +"É seguro (e uma boa ideia) habilitar esta opção, a não ser que você utilize uma rede corporativa intrusiva ou o programa de antivírus Kapersky, que monitora a sua navegação com um proxy TLS e um Certificado de Autoridade cuja raiz é privada. Se habilitada em uma rede deste tipo; por causa dos certificados únicos que seriam produzidos; esta opção pode publicar provas de quais domínios https:// foram visitados através daquele proxy. Por isso, como padrão nós a desabilitamos."> <!ENTITY ssl-observatory.prefs.anonymous "Utilize Tor para verificar os certificados de forma anônima"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Jan '14

15 Jan '14

commit 06e1fe19bebdc87179098675e114bca2d8648e08 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 05:16:02 2014 +0000 Update translations for https_everywhere --- pt_BR/ssl-observatory.dtd | 2 +- ta/https-everywhere.dtd | 58 ++++++++++++++++++++-------------------- ta/https-everywhere.properties | 4 +-- ta/ssl-observatory.dtd | 28 +++++++++---------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd index 5fe5b93..28c0de7 100644 --- a/pt_BR/ssl-observatory.dtd +++ b/pt_BR/ssl-observatory.dtd @@ -29,7 +29,7 @@ to turn it on?">--> "Submeter e verificar os certificados assinados pelas non-standard root CAs"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -"É seguro (e uma boa idéia) habilitar esta opção, a não ser que você utilize uma rede corporativa intrusiva ou o antivírus Kapersky, que monitora a sua navegação com um proxy TLS e um certificado Certificate Authority cuja raiz é privada. Se habilitada em uma rede deste tipo, esta opção pode publicar provas de quais domínios https:// foram visitados através daquele proxy, por causa dos certificados únicos que seriam produzidos. Por isso, como padrão, nós a desabilitamos."> +"É seguro (e uma boa ideia) habilitar esta opção, a não ser que você utilize uma rede corporativa intrusiva ou o programa de antivírus Kapersky, que monitora a sua navegação com um proxy TLS e um Certificado de Autoridade cuja raiz é privada. Se habilitada em uma rede deste tipo; por causa dos certificados únicos que seriam produzidos; esta opção pode publicar provas de quais domínios https:// foram visitados através daquele proxy. Por isso, como padrão nós a desabilitamos."> <!ENTITY ssl-observatory.prefs.anonymous "Utilize Tor para verificar os certificados de forma anônima"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable diff --git a/ta/https-everywhere.dtd b/ta/https-everywhere.dtd index 8e5a0c6..11cb416 100644 --- a/ta/https-everywhere.dtd +++ b/ta/https-everywhere.dtd @@ -1,46 +1,46 @@ -<!ENTITY https-everywhere.about.title "About HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> +<!ENTITY https-everywhere.about.title "எல்லா இடங்களிலும் HTTPS பற்றி"> +<!ENTITY https-everywhere.about.ext_name "எல்லா இடங்களிலும் HTTPS"> <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> -<!ENTITY https-everywhere.about.version "Version"> -<!ENTITY https-everywhere.about.created_by "Created by"> -<!ENTITY https-everywhere.about.librarians "Ruleset Librarians"> -<!ENTITY https-everywhere.about.thanks "Thanks to"> +<!ENTITY https-everywhere.about.version "பதிப்பு"> +<!ENTITY https-everywhere.about.created_by "உருவாக்கப்பட்டது"> +<!ENTITY https-everywhere.about.librarians "Ruleset நூலகர்கள்"> +<!ENTITY https-everywhere.about.thanks "நன்றிகள்"> <!ENTITY https-everywhere.about.contribute "If you like HTTPS Everywhere, you might consider"> -<!ENTITY https-everywhere.about.donate_tor "Donating to Tor"> +<!ENTITY https-everywhere.about.donate_tor "Tor நன்கொடை"> <!ENTITY https-everywhere.about.tor_lang_code "en"> -<!ENTITY https-everywhere.about.donate_eff "Donating to EFF"> +<!ENTITY https-everywhere.about.donate_eff "EFF நன்கொடை"> -<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> -<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "எல்லா இடங்களிலும் HTTPS பற்றி"> +<!ENTITY https-everywhere.menu.observatory "SSL அவதான விருப்பங்கள்"> +<!ENTITY https-everywhere.menu.globalEnable "எல்லா இடங்களிலும் HTTPS செயலாக்கு"> +<!ENTITY https-everywhere.menu.globalDisable "எல்லா இடங்களிலும் HTTPS முடக்கு"> <!ENTITY https-everywhere.menu.showCounter "Show Counter"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences"> -<!ENTITY https-everywhere.prefs.enable_all "Enable All"> -<!ENTITY https-everywhere.prefs.disable_all "Disable All"> -<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.enable_all "அனைத்தும் செயலாக்கு"> +<!ENTITY https-everywhere.prefs.disable_all "அனைத்தும் முடக்கு"> +<!ENTITY https-everywhere.prefs.reset_defaults "இயல்புநிலைக்கு மீட்டமை"> <!ENTITY https-everywhere.prefs.search "தேடு"> -<!ENTITY https-everywhere.prefs.site "Site"> -<!ENTITY https-everywhere.prefs.notes "Notes"> -<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?"> -<!ENTITY https-everywhere.prefs.enabled "Enabled"> +<!ENTITY https-everywhere.prefs.site "தளம்"> +<!ENTITY https-everywhere.prefs.notes "குறிப்புகள்"> +<!ENTITY https-everywhere.prefs.list_caption "எந்த HTTPS திருப்பிவிடுதல் விதிகளை விண்ணப்பிக்க வேண்டும்?"> +<!ENTITY https-everywhere.prefs.enabled "இயக்கப்பட்டது"> <!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)"> -<!ENTITY https-everywhere.prefs.here_link "here"> -<!ENTITY https-everywhere.prefs.toggle "Toggle"> -<!ENTITY https-everywhere.prefs.reset_default "Reset to Default"> -<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source"> +<!ENTITY https-everywhere.prefs.here_link "இங்கே"> +<!ENTITY https-everywhere.prefs.toggle "மாற்று"> +<!ENTITY https-everywhere.prefs.reset_default "இயல்புநிலைக்கு மீட்டமை"> +<!ENTITY https-everywhere.prefs.view_xml_source "XML மூலத்தை காண"> -<!ENTITY https-everywhere.source.downloading "Downloading"> -<!ENTITY https-everywhere.source.filename "Filename"> -<!ENTITY https-everywhere.source.unable_to_download "Unable to download source."> +<!ENTITY https-everywhere.source.downloading "பதிவிறக்குகிறது"> +<!ENTITY https-everywhere.source.filename "கோப்பின் பெயர்"> +<!ENTITY https-everywhere.source.unable_to_download "மூலத்தை பதிவிறக்க இயலவில்லை."> -<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification"> +<!ENTITY https-everywhere.popup.title "HTTPS எல்லா இடங்களிலும் 4.0மேம்பாட்டு.11 அறிவிக்கை"> <!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release."> -<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?"> +<!ENTITY https-everywhere.popup.paragraph2 "நீங்கள் மீண்டும் நிலையாக செல்ல விரும்புகிறீர்களா?"> <!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere(a)eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere."> <!ENTITY https-everywhere.popup.keep "Keep me on the development version"> -<!ENTITY https-everywhere.popup.revert "Download the latest stable version"> +<!ENTITY https-everywhere.popup.revert "சமீபத்திய நிலையான பதிப்பை பதிவிறக்கு"> <!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "ரத்துசெய்"> diff --git a/ta/https-everywhere.properties b/ta/https-everywhere.properties index 21feda9..eedf316 100644 --- a/ta/https-everywhere.properties +++ b/ta/https-everywhere.properties @@ -1,5 +1,5 @@ -# https-everywhere.menu.globalEnable = Enable HTTPS Everywhere -# https-everywhere.menu.globalDisable = Disable HTTPS Everywhere +https-everywhere.menu.globalEnable = எல்லா இடங்களிலும் HTTPS செயலாக்கு +https-everywhere.menu.globalDisable = எல்லா இடங்களிலும் HTTPS முடக்கு # https-everywhere.menu.enableDisable = Enable / Disable Rules # https-everywhere.menu.noRules = (No Rules for This Page) # https-everywhere.menu.unknownRules = (Rules for This Page Unknown) diff --git a/ta/ssl-observatory.dtd b/ta/ssl-observatory.dtd index 3f5ff09..b489dbb 100644 --- a/ta/ssl-observatory.dtd +++ b/ta/ssl-observatory.dtd @@ -1,6 +1,6 @@  -<!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> -<!ENTITY ssl-observatory.popup.later "Ask Me Later"> +<!ENTITY ssl-observatory.popup.details "விவரங்கள் மற்றும் தனியுரிமை தகவல்கள்"> +<!ENTITY ssl-observatory.popup.later "பின்னர் என்னிடம் கேள்"> <!ENTITY ssl-observatory.popup.no "இல்லை"> <!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks @@ -13,7 +13,7 @@ and auditing the certificates being presented to your browser. Would you like to turn it on?">--> <!ENTITY ssl-observatory.popup.title -"Should HTTPS Everywhere use the SSL Observatory?"> +"HTTPS எல்லா இடங்களிலும் SSL அவதானத்தை பயன்படுத்த வேண்டும்?"> <!ENTITY ssl-observatory.popup.yes "சரி"> @@ -32,9 +32,9 @@ intrusive corporate network:"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip "It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default."> -<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity"> +<!ENTITY ssl-observatory.prefs.anonymous "அநாமதேயத்திற்க்கு Tor பயன்படுத்தி சான்றிதழ்களை சரிபார்க்கவும்"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -"Check certificates using Tor for anonymity (requires Tor)"> +"அநாமதேயத்திற்க்கு Tor பயன்படுத்தி சான்றிதழ்களை சரிபார்க்கவும் (Tor தேவைப்படுகிறது)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip "This option requires Tor to be installed and running"> @@ -64,10 +64,10 @@ received by the Observatory will indicate that somebody visited www.something.com, but not who visited the site, or what specific page they looked at. Mouseover the options for further details:"> -<!ENTITY ssl-observatory.prefs.hide "Hide advanced options"> +<!ENTITY ssl-observatory.prefs.hide "மேம்பட்ட விருப்பங்களை மறை"> <!ENTITY ssl-observatory.prefs.nonanon -"Check certificates even if Tor is not available"> +"Tor இல்லை என்றாலும் சான்றிதழ்களை சரிபார்க்கவும்"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip "We will still try to keep the data anonymous, but this option is less secure"> @@ -78,18 +78,18 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip "Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system."> -<!ENTITY ssl-observatory.prefs.show "Show advanced options"> +<!ENTITY ssl-observatory.prefs.show "மேம்பட்ட விருப்பங்களை காண்பி"> -<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> +<!ENTITY ssl-observatory.prefs.title "SSL அவதான விருப்பங்கள்"> -<!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> -<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> -<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain"> -<!ENTITY ssl-observatory.warning.okay "I understand"> +<!ENTITY ssl-observatory.prefs.use "அவதானத்தை பயன்படுத்தவும்?"> +<!ENTITY ssl-observatory.warning.title "EFF's SSL அவதானத்தில் இருந்து எச்சரிக்கை"> +<!ENTITY ssl-observatory.warning.showcert "சான்றிதழ் சங்கிலியை காட்டு"> +<!ENTITY ssl-observatory.warning.okay "நான் புரிந்துகொள்கிறேன்"> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> <!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection."> <!ENTITY ssl-observatory.prefs.self_signed -"Submit and check self-signed certificates"> +"சமர்ப்பித்து சுய நுழைவு சான்றிதழை சரிபார்க்க"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip "This is recommended; cryptographic problems are especially common in self-signed embedded devices">

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 15 Jan '14

15 Jan '14

commit b0144ba27cb4481304eaf76e991c2a237787e5ff Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 05:15:50 2014 +0000 Update translations for vidalia_installer --- ta/vidalia_ta.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ta/vidalia_ta.po b/ta/vidalia_ta.po index ec64610..3b44fcd4 100755 --- a/ta/vidalia_ta.po +++ b/ta/vidalia_ta.po @@ -3,16 +3,16 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" "PO-Revision-Date: 2010-12-05 20:21+0000\n" "Last-Translator: \n" -"Language-Team: translations(a)vidalia-project.net\n" +"Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ta\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "BundleSetupCaption" msgid "${BUNDLE_NAME} setup" @@ -207,7 +207,7 @@ msgstr "" msgctxt "LanguageCode" msgid "en" -msgstr "" +msgstr "en" msgctxt "FirefoxWarningPageTitle" msgid "Firefox is not installed" @@ -237,5 +237,3 @@ msgid "" "Or, if you would prefer to install Tor without Firefox, simply\n" "press Next to continue." msgstr "" - -

1 0