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

[orbot/master] ensure setConft on control port works consistently
by n8fr8＠torproject.org 02 May '14

02 May '14

commit b9f14b318b581f10de867d1533bacf0678d7fe55 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 2 00:39:37 2014 -0400 ensure setConft on control port works consistently --- src/org/torproject/android/service/TorService.java | 65 ++++++++++++++------ 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 21c6247..5075116 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -18,6 +18,7 @@ import java.io.PrintWriter; import java.net.Socket; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashMap; import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; @@ -75,8 +76,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static final int MAX_START_TRIES = 3; - private ArrayList<String> configBuffer = null; - private ArrayList<String> resetBuffer = null; + private LinkedHashMap<String,String> configBuffer = null; + private LinkedHashMap<String,String> resetBuffer = null; // private String appHome; private File appBinHome; @@ -144,7 +145,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst processSettingsImpl(); - currentStatus = STATUS_ON; + String state = conn.getInfo("dormant"); + if (state != null && Integer.parseInt(state) == 0) + currentStatus = STATUS_ON; + else + currentStatus = STATUS_CONNECTING; return true; } @@ -1188,7 +1193,24 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(sb.toString()); } + + /** + if (currentStatus != STATUS_ON) + { + try { + String state; + + state = conn.getInfo("dormant"); + if (state != null && Integer.parseInt(state) == 0) + currentStatus = STATUS_ON; + else + currentStatus = STATUS_CONNECTING; + + } catch (IOException e) { + logException("Error getting state from Tor control port",e); + } + }*/ } @@ -1349,19 +1371,19 @@ public class TorService extends Service implements TorServiceConstants, TorConst public boolean updateConfiguration (String name, String value, boolean saveToDisk) { if (configBuffer == null) - configBuffer = new ArrayList<String>(); + configBuffer = new LinkedHashMap<String,String>(); if (resetBuffer == null) - resetBuffer = new ArrayList<String>(); + resetBuffer = new LinkedHashMap<String,String>(); if (value == null || value.length() == 0) { - resetBuffer.add(name); + resetBuffer.put(name,""); } else { - configBuffer.add(name + ' ' + value); + configBuffer.put(name,value); } return false; @@ -1398,14 +1420,24 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (resetBuffer != null && resetBuffer.size() > 0) { - conn.resetConf(resetBuffer); + conn.resetConf(resetBuffer.keySet()); resetBuffer = null; } if (configBuffer != null && configBuffer.size() > 0) { - conn.setConf(configBuffer); + for (String key : configBuffer.keySet()) + { + + String value = configBuffer.get(key); + + if (TorService.ENABLE_DEBUG_LOG) + logMessage("Setting conf: " + key + "=" + value); + + conn.setConf(key, value); + + } configBuffer = null; } @@ -1420,11 +1452,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logException("Unable to update Tor configuration: " + ioe.getMessage(),ioe); - if (configBuffer != null) - for (String config : configBuffer) - { - logNotice("Error applying config: " + config); - } } @@ -1701,8 +1728,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst return false; } - mBinder.updateConfiguration("UseBridges", "1", false); - String bridgeDelim = "\n"; if (bridgeList.indexOf(",") != -1) @@ -1724,6 +1749,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst } mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false); + + + mBinder.updateConfiguration("UseBridges", "1", false); + + } else { @@ -1835,8 +1865,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void enableSocks (String ip, int port, boolean safeSocks) throws RemoteException { - mBinder.updateConfiguration("SOCKSPort", port + "", false); - mBinder.updateConfiguration("SOCKSListenAddress", ip, false); + mBinder.updateConfiguration("SOCKSPort", ip + ":" + port + "", false); mBinder.updateConfiguration("SafeSocks", safeSocks ? "1" : "0", false); mBinder.updateConfiguration("TestSocks", "1", false); mBinder.updateConfiguration("WarnUnsafeSocks", "1", false);

1 0

[orbot/master] remove unused preference
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 147b57af4293b189f1b00b23a8b9e0877f315a4a Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 2 00:40:19 2014 -0400 remove unused preference --- res/xml/preferences.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 5c310c4..095a5d0 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -105,11 +105,6 @@ android:summary="@string/use_only_these_specified_nodes"/> android:title="@string/use_bridges" android:key="pref_bridges_enabled" android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"/> -<CheckBoxPreference android:key="pref_bridges_obfuscated" - android:defaultValue="false" -android:title="@string/bridges_obfuscated" -android:summary="@string/enable_if_configured_bridges_are_obfuscated_bridges"/> - <EditTextPreference android:key="pref_bridges_list" android:title="@string/bridges" android:summary="@string/ip_address_and_port_of_bridges"

1 0

[orbot/master] updated changelog for v14
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 648b10c235cca5960ef22844e1bb6214e14459e4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 2 01:18:22 2014 -0400 updated changelog for v14 --- CHANGELOG | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 81f0ab6..ca363a7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,34 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +14.0.0 (ALPHA-2) +ea919c5 add the basic proguard support +147b57a remove unused preference +0dc50cc add log max size feature +b9f14b3 ensure setConft on control port works consistently +b056e7f remove debug waiter +b2d4bb3 updated to v14-alpha-2 +cbbc5e4 improve how we start/stop Tor, Polipo to find process id, do ps of all, then filter (most compat) use async service for Tor st +b31c11f updated icons with dark background +2b6ff4e update manifest for v14-alpha-1 +05b6553 add binary stripping to makefile +21c1cad update binaries and torrc for obfs/PT work +144460b fixes for preference handling in multi process context +38700f9 updated to 0.2.5.3 for scramblesuit/obfs support +d3865c0 fix settings handling and add more debug output also make SOCKS a runtime config +d529334 clean up wizard context use +0178d3e add new binaries and configs for polipo and others +40546c9 change from privoxy to polipo for http proxy +a4d8669 fix variable name to obfsclient +2f7a9dd update to new obfsclient repo +000cf57 update jtorctrl jar +f485015 install obfsclient binary +d003826 update binaries +4d3754b remove obfsproxy, update obfsclient +7af85b5 small updates to Makefile for NDK +2c2d094 Integrate obfsclient/liballium into the build process +43c259a Update the obfsclient submodule to include Android fixes +a6af878 liballium/obfsclient should be sourced from tp.o repos + 13.0.6 89fc2e6 updated to 13.0.6-RC-3 b9eeb37 ensure Service has foreground priority so it is not killed (and improve onBind() calls to reset state if it is killed)

1 0

[orbot/master] improvement for network state checking code
by n8fr8＠torproject.org 02 May '14

02 May '14

commit b8140191efc3130ae9d03499e903b78c43d62a7f Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 2 10:10:09 2014 -0400 improvement for network state checking code --- src/org/torproject/android/service/TorService.java | 25 ++++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 5075116..97e2851 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -18,8 +18,8 @@ import java.io.PrintWriter; import java.net.Socket; import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.StringTokenizer; @@ -48,6 +48,7 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.graphics.Color; import android.net.ConnectivityManager; +import android.net.NetworkInfo; import android.os.AsyncTask; import android.os.IBinder; import android.os.RemoteCallbackList; @@ -55,7 +56,6 @@ import android.os.RemoteException; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat.Builder; import android.util.Log; -import android.widget.TextView; public class TorService extends Service implements TorServiceConstants, TorConstants, EventHandler { @@ -1580,12 +1580,22 @@ public class TorService extends Service implements TorServiceConstants, TorConst SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - mConnectivity = !intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false); - boolean doNetworKSleep = prefs.getBoolean(TorConstants.PREF_DISABLE_NETWORK, true); if (doNetworKSleep && mBinder != null) { + final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); + final NetworkInfo netInfo = cm.getActiveNetworkInfo(); + + if(netInfo != null && netInfo.isConnected()) { + // WE ARE CONNECTED: DO SOMETHING + mConnectivity = true; + } + else { + // WE ARE NOT: DO SOMETHING ELSE + mConnectivity = false; + } + try { mBinder.updateConfiguration("DisableNetwork", mConnectivity ? "0" : "1", false); mBinder.saveConfiguration(); @@ -1870,7 +1880,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst mBinder.updateConfiguration("TestSocks", "1", false); mBinder.updateConfiguration("WarnUnsafeSocks", "1", false); - + } + + private void blockPlaintextPorts (String portList) throws RemoteException + { + + mBinder.updateConfiguration("RejectPlaintextPorts",portList,false); } //using Google DNS for now as the public DNS server

1 0

[orbot/master] add the basic proguard support
by n8fr8＠torproject.org 02 May '14

02 May '14

commit ea919c55b7fe5cc20dbb8d4cef65867cd236bf7c Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 2 00:40:57 2014 -0400 add the basic proguard support --- project.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/project.properties b/project.properties index cf33a83..ea84c57 100644 --- a/project.properties +++ b/project.properties @@ -6,6 +6,7 @@ # To customize properties used by the Ant build system use, # "ant.properties", and override values to adapt the script to your # project structure. +proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. target=android-19

1 0

[orbot/master] liballium/obfsclient should be sourced from tp.o repos
by n8fr8＠torproject.org 02 May '14

02 May '14

commit a6af8784addd142343856429b4aba80093e41710 Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Apr 9 12:35:43 2014 -0700 liballium/obfsclient should be sourced from tp.o repos Signed-off-by: Nathan Freitas <nathan(a)freitas.net> --- .gitmodules | 5 ++++- external/liballium | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 1c98c01..927bcca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,7 +21,10 @@ url = git://git.netfilter.org/iptables [submodule "external/obfsclient"] path = external/obfsclient - url = https://github.com/Yawning/obfsclient.git + url = https://git.torproject.org/user/yawning/obfsclient.git [submodule "external/superuser-commands"] path = external/superuser-commands url = https://github.com/dschuermann/superuser-commands.git +[submodule "external/liballium"] + path = external/liballium + url = https://git.torproject.org/user/yawning/liballium.git diff --git a/external/liballium b/external/liballium new file mode 160000 index 0000000..5272de7 --- /dev/null +++ b/external/liballium @@ -0,0 +1 @@ +Subproject commit 5272de7361897ee6b5c969fd1eec6609d64ac13a

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 02 May '14

02 May '14

commit 107e2db40df1615cb0791f8171193c8aca2579b9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 2 13:46:54 2014 +0000 Update translations for tor-launcher-properties_completed --- ca/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/ca/torlauncher.properties b/ca/torlauncher.properties index c4ad782..d2e1d15 100644 --- a/ca/torlauncher.properties +++ b/ca/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=les identitats no coincideixen torlauncher.bootstrapWarning.timeout=S'ha excedit el temps d'espera de connexió torlauncher.bootstrapWarning.noroute=no hi ha ruta cap al servidor torlauncher.bootstrapWarning.ioerror=error de lectura/escriptura +torlauncher.bootstrapWarning.pt_missing=falta de transport afegible

1 0

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

02 May '14

commit 99a0e9496cbfc723a10ee798810839b43c286860 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 2 13:46:49 2014 +0000 Update translations for tor-launcher-properties --- ca/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/torlauncher.properties b/ca/torlauncher.properties index c423d03..d2e1d15 100644 --- a/ca/torlauncher.properties +++ b/ca/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=les identitats no coincideixen torlauncher.bootstrapWarning.timeout=S'ha excedit el temps d'espera de connexió torlauncher.bootstrapWarning.noroute=no hi ha ruta cap al servidor torlauncher.bootstrapWarning.ioerror=error de lectura/escriptura -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=falta de transport afegible

1 0

[tor-browser-bundle/master] Add stopgap for shipping HTTPS-Everywhere.
by gk＠torproject.org 02 May '14

02 May '14

commit 35411af55b92ee4d1c823aaefc5a5062ac940787 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 2 09:17:54 2014 +0000 Add stopgap for shipping HTTPS-Everywhere. Until bug 11630 is fixed we add a better stopgap than shipping outdated HTTPS-Everywhere versions: we take the NoScript route and download and use the .xpi made by the EFF. --- gitian/descriptors/linux/gitian-bundle.yml | 11 ++++++----- gitian/descriptors/mac/gitian-bundle.yml | 11 ++++++----- gitian/descriptors/windows/gitian-bundle.yml | 11 ++++++----- gitian/fetch-inputs.sh | 6 ++++-- gitian/versions.beta | 4 ++++ gitian/versions.nightly | 4 ++++ 6 files changed, 30 insertions(+), 17 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index c16589a..006883c 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "linux-skeleton.zip" - "linux-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "dtar.sh" - "bare-version" @@ -88,13 +89,13 @@ script: | ~/build/dzip.sh ../../../tor-browser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + #cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh - cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + #rm -f .git/refs/heads/master + #./makexpi.sh + #cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cd .. # cp *.xpi tor-browser/Data/Browser/profile.default/extensions/ cd tor-browser/Data/Browser/profile.default/extensions diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 263ca57..2668c7d 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "ddmg.sh" - "libdmg.patch" @@ -95,13 +96,13 @@ script: | ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + # cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh - cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + # rm -f .git/refs/heads/master + # ./makexpi.sh + # cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + # cd .. # cp *.xpi ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ cd $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 457fa7b..ebde49b 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -37,6 +37,7 @@ files: - "windows-skeleton.zip" - "win32-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "bare-version" - "bundle.inputs" @@ -78,13 +79,13 @@ script: | ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + #cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh - cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + #rm -f .git/refs/heads/master + #./makexpi.sh + #cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cd .. # cp *.xpi tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index f80348e..b542cf0 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -206,8 +206,9 @@ done cd .. -# NoScript and PDF.JS are magikal and special: +# NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} +wget -U "" -N ${HTTPSE_URL} # So is mingw: if [ ! -f mingw-w64-svn-snapshot.zip ]; @@ -226,7 +227,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -262,6 +263,7 @@ done cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi +ln -sf "$HTTPSE_PACKAGE" https-everywhere(a)eff.org.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 diff --git a/gitian/versions.beta b/gitian/versions.beta index 3460248..b5cfa53 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -38,11 +38,13 @@ M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 +HTTPSE_VER=3.5.1 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.20-fn+fx+sm.xpi +HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -69,6 +71,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -89,6 +92,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c8a8d7c..355b68a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -39,11 +39,13 @@ M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 +HTTPSE_VER=3.5.1 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.20-fn+fx+sm.xpi +HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -70,6 +72,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -90,6 +93,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC…

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 02 May '14

02 May '14

commit 48fc600e301f16d3ea25db80f465a2c8af8054bc Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 2 00:46:15 2014 +0000 Update translations for tor-launcher-progress_completed --- bg/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/progress.dtd b/bg/progress.dtd index d60b44e..45a5ee3 100644 --- a/bg/progress.dtd +++ b/bg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Състояние на Тор"> <!ENTITY torprogress.openSettings "Отвори настройки"> <!ENTITY torprogress.heading "Свързване с Тор мрежата"> -<!ENTITY torprogress.pleaseWait "Браузърът Tor ще се отвори, щом Tor връзка е остановена "> +<!ENTITY torprogress.pleaseWait "Моля изчакайте,докато установим връзка с Тор мрежата.">

1 0