- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-7.0] Bug 22479: create jessie amd64 VM in make-vms.sh
by gk＠torproject.org 03 Jun '17

03 Jun '17

commit 1bf37e1a096c6fe12cba1a26a4ac7dd800722ad2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Jun 3 11:16:17 2017 +0200 Bug 22479: create jessie amd64 VM in make-vms.sh --- gitian/make-vms.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index f47deca..b5e4be2 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -32,7 +32,7 @@ build_and_test_vm() { then export LXC_SUITE=$dist export LXC_ARCH=$arch - if [ "$dist" = "wheezy" ]; + if [ "$dist" = "wheezy" -o "$dist" = "jessie" ]; then export DISTRO=debian ./bin/make-base-vm --distro debian --suite $dist --lxc --arch $arch @@ -41,7 +41,7 @@ build_and_test_vm() { ./bin/make-base-vm --suite $dist --lxc --arch $arch fi else - if [ "$dist" = "wheezy" ]; + if [ "$dist" = "wheezy" -o "$dist" = "jessie" ]; then export DISTRO=debian ./bin/make-base-vm --distro debian --suite $dist --arch $arch @@ -89,6 +89,15 @@ do echo done +while ! build_and_test_vm jessie amd64 64 +do + stop-target 64 jessie + rm ./base-jessie-amd64* + echo + echo "Jessie amd64 VM build failed... Trying again" + echo +done + while ! build_and_test_vm precise i386 32 do stop-target 32 precise

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit e23767abdf49958fef9a2c668d69d58466b032a1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 2 13:33:14 2017 +0000 Release preparations for 7.0 Changelog update, versions bump, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 134 ++++++++++++++++++++++++++++++++++++++ gitian/versions | 16 ++--- tools/update-responses/config.yml | 20 +++--- 3 files changed, 154 insertions(+), 16 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9f00100..4411b56 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,137 @@ +Tor Browser 7.0 -- June 6 2017 + * All Platforms + * Update Firefox to 52.1.2esr + * Update Tor to 0.3.0.7 + * Update Torbutton to 1.9.7.3 + * Bug 22104: Adjust our content policy whitelist for ff52-esr + * Bug 22457: Allow resources loaded by view-source:// + * Bug 21627: Ignore HTTP 304 responses when checking redirects + * Bug 22459: Adapt our use of the nsIContentPolicy to e10s mode + * Bug 21865: Update our JIT preferences in the security slider + * Bug 21747: Make 'New Tor Circuit for this Site' work in ESR52 + * Bug 21745: Fix handling of catch-all circuit + * Bug 21547: Fix circuit display under e10s + * Bug 21268: e10s compatibility for New Identity + * Bug 21267: Remove window resize implementation for now + * Bug 21201: Make Torbutton multiprocess compatible + * Translations update + * Update Tor Launcher to 0.2.12.2 + * Bug 22283: Linux 7.0a4 broken after update due to unix: lines in torrc + * Bug 20761: Don't ignore additional SocksPorts + * Bug 21920: Don't show locale selection dialog + * Bug 21546: Mark Tor Launcher as multiprocess compatible + * Bug 21264: Add a README file + * Translations update + * Update HTTPS-Everywhere to 5.2.17 + * Update NoScript to 5.0.5 + * Update Go to 1.8.3 (bug 22398) + * Bug 21962: Fix crash on about:addons page + * Bug 21766: Fix crash when the external application helper dialog is invoked + * Bug 21886: Download is stalled in non-e10s mode + * Bug 21778: Canvas prompt is not shown in Tor Browser based on ESR52 + * Bug 21569: Add first-party domain to Permissions key + * Bug 22165: Don't allow collection of local IP addresses + * Bug 13017: Work around audio fingerprinting by disabling the Web Audio API + * Bug 10286: Disable Touch API and add fingerprinting resistance as fallback + * Bug 13612: Disable Social API + * Bug 10283: Disable SpeechSynthesis API + * Bug 22333: Disable WebGL2 API for now + * Bug 21861: Disable additional mDNS code to avoid proxy bypasses + * Bug 21684: Don't expose navigator.AddonManager to content + * Bug 21431: Clean-up system extensions shipped in Firefox 52 + * Bug 22320: Use preference name 'referer.hideOnionSource' everywhere + * Bug 16285: Don't ship ClearKey EME system and update EME preferences + * Bug 21675: Spoof window.navigator.hardwareConcurrency + * Bug 21792: Suppress MediaError.message + * Bug 16337: Round times exposed by Animation API to nearest 100ms + * Bug 21972: about:support is partially broken + * Bug 21726: Keep Graphite support disabled + * Bug 21323: Enable Mixed Content Blocking + * Bug 21685: Disable remote new tab pages + * Bug 21790: Disable captive portal detection + * Bug 21686: Disable Microsoft Family Safety support + * Bug 22073: Make sure Mozilla's experiments are disabled + * Bug 21683: Disable newly added Safebrowsing capabilities + * Bug 22071: Disable Kinto-based blocklist update mechanism + * Bug 22415: Fix format error in our pipeline patch + * Bug 22072: Hide TLS error reporting checkbox + * Bug 20761: Don't ignore additional SocksPorts + * Bug 21862: Rip out potentially unsafe Rust code + * Bug 16485: Improve about:cache page + * Bug 22462: Backport of patch for bug 1329521 to fix assertion failure + * Bug 21340: Identify and backport new patches from Firefox + * Bug 22153: Fix broken feeds on higher security levels + * Bug 22025: Fix broken certificate error pages on higher security levels + * Bug 21887: Fix broken error pages on higher security levels + * Bug 22458: Fix broken `about:cache` page on higher security levels + * Bug 21876: Enable e10s by default on all supported platforms + * Bug 21876: Always use esr policies for e10s + * Bug 20905: Fix resizing issues after moving to a direct Firefox patch + * Bug 21875: Modal dialogs are maximized in ESR52 nightly builds + * Bug 21885: SVG is not disabled in Tor Browser based on ESR52 + * Bug 17334: Hide Referer when leaving a .onion domain (improved patch) + * Bug 18531: Uncaught exception when opening ip-check.info + * Bug 18574: Uncaught exception when clicking items in Library + * Bug 22327: Isolate Page Info media previews to first party domain + * Bug 22452: Isolate tab list menuitem favicons to first party domain + * Bug 15555: View-source requests are not isolated by first party domain + * Bug 3246: Double-key cookies + * Bug 8842: Fix XML parsing error + * Bug 5293: Neuter fingerprinting with Battery API + * Bug 16886: 16886: "Add-on compatibility check dialog" contains Firefox logo + * Bug 19645: TBB zooms text when resizing browser window + * Bug 19192: Untrust Blue Coat CA + * Bug 19955: Avoid confusing warning that favicon load request got cancelled + * Bug 20005: Backport fixes for memory leaks investigation + * Bug 20755: ltn.com.tw is broken in Tor Browser + * Bug 21896: Commenting on website is broken due to CAPTCHA not being displayed + * Bug 20680: Rebase Tor Browser patches to 52 ESR + * Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge + * Bug 22468: Add default obfs4 bridges frosty and dragon + * Windows + * Bug 22419: Prevent access to file:// + * Bug 12426: Make use of HeapEnableTerminationOnCorruption + * Bug 19316: Make sure our Windows updates can deal with the SSE2 requirement + * Bug 21868: Fix build bustage with FIREFOX_52_0_2esr_RELEASE for Windows + * OS X + * Bug 21940: Don't allow privilege escalation during update + * Bug 22044: Fix broken default search engine on macOS + * Bug 21879: Use our default bookmarks on OSX + * Bug 21779: Non-admin users can't access Tor Browser on macOS + * Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID + * Bug 21724: Make Firefox and Tor Browser distinct macOS apps + * Bug 21931: Backport OSX SetupMacCommandLine updater fixes + * Bug 15910: Don't download GMPs via the local fallback + * Linux + * Bug 16285: Remove ClearKey related library stripping + * Bug 22041: Fix update error during update to 7.0a3 + * Bug 22238: Fix use of hardened wrapper for Firefox build + * Bug 21907: Fix runtime error on CentOS 6 + * Bug 15910: Don't download GMPs via the local fallback + * Android + * Bug 19078: Disable RtspMediaResource stuff in Orfox + * Build system + * Windows + * Bug 21837: Fix reproducibility of accessibility code for Windows + * Bug 21240: Create patches to fix mingw-w64 compilation of Firefox ESR 52 + * Bug 21904: Bump mingw-w64 commit to help with sandbox compilation + * Bug 18831: Use own Yasm for Firefox cross-compilation + * OS X + * Bug 21328: Updating to clang 3.8.0 + * Bug 21754: Remove old GCC toolchain and macOS SDK + * Bug 19783: Remove unused macOS helper scripts + * Bug 10369: Don't use old GCC toolchain anymore for utils + * Bug 21753: Replace our old GCC toolchain in PT descriptor + * Bug 18530: ESR52 based Tor Browser only runs on macOS 10.9+ + * Bug 22328: Remove clang PIE wrappers + * Linux + * Bug 21930: NSS libraries are missing from mar-tools archive + * Bug 21239: Adapt Linux Firefox descriptor to ESR52 (use GTK2) + * Bug 21960: Linux bundles based on ESR 52 are not reproducible anymore + * Bug 21629: Fix broken ASan builds when switching to ESR 52 + * Bug 22444: Use hardening-wrapper when building GCC + * Bug 22361: Fix hardening of libraries built in linux/gitian-utils.yml + Tor Browser 7.0a4 -- May 15 2017 * All Platforms * Update Firefox to 52.1.1esr diff --git a/gitian/versions b/gitian/versions index 95c4e26..d385801 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.1.1esr +FIREFOX_VERSION=52.1.2esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build2 -TOR_TAG=tor-0.3.0.6 -TORLAUNCHER_TAG=0.2.12.1 -TORBUTTON_TAG=1.9.7.2 -HTTPSE_TAG=5.2.16 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 +TOR_TAG=tor-0.3.0.7 +TORLAUNCHER_TAG=0.2.12.2 +TORBUTTON_TAG=1.9.7.3 +HTTPSE_TAG=5.2.17 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## 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-5.0.4-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.5-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=cd8e5561bdd7331d9fdd510fb1bd1cb6460d64f351076b523d31361ff9853c76 +NOSCRIPT_HASH=bf1dee39f6e5936df2b03b794c1efc9236b440536a05fafcff667e33903e6aed CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 6a9a142..8b98b8e 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,19 +20,23 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 6.0.1 + release: 7.0 versions: - 6.0.1: - platformVersion: 45.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-601-released + 7.0: + platformVersion: 52.1.2 + detailsURL: https://blog.torproject.org/blog/tor-browser-70-released incremental_from: - - 5.5.5 - - 6.0 + - 6.5.2 migrate_archs: osx32: osx64 + migrate_langs: + pt-PT: pt-BR + win32: + minSupportedInstructionSet: SSE2 osx32: - minSupportedOSVersion: 10.8 - detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… + minSupportedOSVersion: 10.9 + osx64: + minSupportedOSVersion: 10.9 7.0a4: platformVersion: 52.1.1 detailsURL: https://blog.torproject.org/blog/tor-browser-70a4-released

1 0

[torbutton/master] Version bump and CHANGELOG update
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit d3a485c83cd2a95d6fa6b255e4b28ed810d9afb0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 2 10:14:41 2017 +0000 Version bump and CHANGELOG update --- src/CHANGELOG | 7 +++++++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 9de9989..1dce5c2 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.7.3 + * Bug 22104: Adjust our content policy whitelist for ff52-esr + * Bug 22457: Allow resources loaded by view-source:// + * Bug 21627: Ignore HTTP 304 responses when checking redirects + * Bug 22459: Adapt our use of the nsIContentPolicy to e10s mode + * Translations update + 1.9.7.2 * Bug 21865: Update our JIT preferences in the security slider * Bug 21747: Make 'New Tor Circuit for this Site' work in ESR52 diff --git a/src/install.rdf b/src/install.rdf index 670dbb6..8c28f40 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.2</em:version> + <em:version>1.9.7.3</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[tor-browser-build/master] Bug 16285: Remove clearkey related library stripping
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit f6652ffc1aa81d5dd4c8af54026d8819710ea302 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 12:51:43 2017 +0200 Bug 16285: Remove clearkey related library stripping We don't ship the clearkey DRM system yet, thus we don't need to strip the respective binaries. tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> tor-browser-bundle.git commit: e8d869e142439436104b8b1f8b807406fd68e104 tor-browser-bundle.git commit: c18c6f80c49d7da97d006d3fd5201b11f1312bbc --- projects/firefox/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index afb11bb..fd9fee5 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -45,7 +45,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% END %] [% IF c("var/linux") %] - mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 + mkdir -p $distdir/Debug/Browser/ [% END %] cd /var/tmp/build/[% project %]-[% c("version") %] @@ -148,7 +148,7 @@ cd $distdir [% IF c("var/linux") %] # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) - for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB

1 0

[tor-browser-build/master] Bug 22324: Fix broken tab crash pages on higher security levels
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 43f24753754f253305fd0e5d7c1812011e791f6a Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 22 09:30:33 2017 +0000 Bug 22324: Fix broken tab crash pages on higher security levels We need to allow JavaScript on `about:tabcrashed` pages explicitly. Otherwise are those pages broken on higher security levels. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 53c1a25..1465e29 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 53c1a25..1465e29 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 53c1a25..1465e29 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-build/master] Revert "Bug 21779: Non-admin users can't access Tor Browser on macOS."
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit fa17542f246d7724b75c10ff8875b89dc657c29e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 12:55:07 2017 +0200 Revert "Bug 21779: Non-admin users can't access Tor Browser on macOS." This reverts commit dd6349a4c118d05797eb211d538ac36b6d08bb59. The problem was the script for recreating the .dmg files after the code-signing set the permissions wrong. No need to fix anything in the bundle descriptor. tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> tor-browser-bundle.git commit: 082738a4bd83943d97e084fa04045e481772b998 --- projects/tor-browser/build | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index d580284..69469db 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -229,12 +229,6 @@ rm -f precomplete python $MARTOOLS/createprecomplete.py popd -[% IF c("var/osx") -%] - # Ensure that files and directories are accessible by non-admin users - # if the app bundle is placed in /Applications. See bug 21779. - chmod -R o+rX "$TBDIR" -[% END -%] - cd $distdir [% IF c("var/build_mar") -%] @@ -307,12 +301,6 @@ rm -rf $distdir/${PKG_DIR} python $MARTOOLS/createprecomplete.py popd - [% IF c("var/osx") -%] - # Ensure that files and directories are accessible by non-admin users - # if the app bundle is placed in /Applications. See bug 21779. - chmod -R o+rX "[% browserdir %]" - [% END -%] - # Create full MAR file and compressed package for this locale. MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_[% lang %].mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "[% browserdir %]"

1 0

[tor-browser-build/master] Bug 21710: Upgrade Go to 1.8.1.
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 8b3f00023bad97241fdd2b50e0f033b57511b725 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 13:04:02 2017 +0200 Bug 21710: Upgrade Go to 1.8.1. Remove workaround for fixed upstream bug, GitHub #17732 (__MAC_OS_X_VERSION_MAX_ALLOWED). I wasn't able to remove the cc-for-target workaround for GitHub #15457 (CC_FOR_TARGET). Even though according to https://github.com/golang/go/issues/15457 it has been been fixed, make.bash still seems to lose all but the first argument of CC_FOR_TARGET somewhere. tor-browser-bundle.git author: David Fifield <david(a)bamsoftware.com> tor-browser-bundle.git commit: 9d546f20ae711e7df9c574d9bdfccf34ddf1b650 --- projects/go/build | 3 --- projects/go/config | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/projects/go/build b/projects/go/build index b7fac08..98f0522 100644 --- a/projects/go/build +++ b/projects/go/build @@ -52,9 +52,6 @@ cd /var/tmp/dist/go/src # http://golang.org/doc/install/source#environment export GOOS=darwin export GOARCH=amd64 - # Remove a preprocessor directive that causes problems when building with the 10.7 SDK. - # https://github.com/golang/go/issues/17732 - sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash [% ELSIF c("var/windows") -%] # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. diff --git a/projects/go/config b/projects/go/config index b36f211..1aa3052 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.7.5 +version: 1.8.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -77,7 +77,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 + sha256sum: 33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bug 22458: Fix broken `about:cache` page on higher security levels
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 762138b1574810cd8fc403b2c29ee56b787864c0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 31 09:13:33 2017 +0000 Bug 22458: Fix broken `about:cache` page on higher security levels We need to allow JavaScript on `about:cache` explicitly. Otherwise it is broken on higher security levels. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 1465e29..6ef2c45 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 1465e29..6ef2c45 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 1465e29..6ef2c45 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-build/master] Bug 22328: remove clang PIE wrappers
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 2e9d63ba9b06b518e21e6f9cbd523d2f8ce11865 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 13:14:53 2017 +0200 Bug 22328: remove clang PIE wrappers Those wrappers are no longer necessary to produce PIE binaries. --- projects/firefox/mozconfig-osx-x86_64 | 12 ++++++------ projects/macosx-toolchain/build | 17 ----------------- projects/macosx-toolchain/config | 4 ++-- projects/openssl/build | 2 +- 4 files changed, 9 insertions(+), 26 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index c75b2f5..1658e18 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -7,9 +7,9 @@ CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" -export CC="$TOOLCHAIN_DIR/clang/helpers/clang $FLAGS" -export CXX="$TOOLCHAIN_DIR/clang/helpers/clang++ $FLAGS" -export CPP="$TOOLCHAIN_DIR/clang/helpers/clang $FLAGS -E" +export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" +export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" +export CPP="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS -E" export LLVMCONFIG=$TOOLCHAIN_DIR/clang/bin/llvm-config export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- @@ -20,9 +20,9 @@ export STRIP=${TOOLCHAIN_PREFIX}strip export OTOOL=${TOOLCHAIN_PREFIX}otool export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil" -export HOST_CC="$TOOLCHAIN_DIR/clang/helpers/clang" -export HOST_CXX="$TOOLCHAIN_DIR/clang/helpers/clang++" -export HOST_CPP="$TOOLCHAIN_DIR/clang/helpers/clang -E" +export HOST_CC="$TOOLCHAIN_DIR/clang/bin/clang" +export HOST_CXX="$TOOLCHAIN_DIR/clang/bin/clang++" +export HOST_CPP="$TOOLCHAIN_DIR/clang/bin/clang -E" export HOST_CFLAGS="-g" export HOST_CXXFLAGS="-g" export HOST_LDFLAGS="-g" diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index b718023..e699e4f 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -11,23 +11,6 @@ cd $distdir/cctools/bin ln -s ../../clang/bin/clang x86_64-apple-darwin10-clang ln -s ../../clang/bin/clang++ x86_64-apple-darwin10-clang++ -cd $distdir -# Bug 20439: build with PIE -# If we add -fPIE to the FLAGS, the firefox build fails in js/src/ctypes/libffi -# with libtool giving an error: -# libtool: compile: unable to infer tagged configuration -# To avoid this error, we add -fPIE using wrappers on clang and clang++ -mkdir clang/helpers -cat > clang/helpers/clang << EOF -#!/bin/sh -exec $distdir/clang/bin/clang -fPIE "\$@" -EOF -cat > clang/helpers/clang++ << EOF -#!/bin/sh -exec $distdir/clang/bin/clang++ -fPIE "\$@" -EOF -chmod +x clang/helpers/clang clang/helpers/clang++ - cd "/var/tmp/dist" [% c('tar', { tar_src => [ project ], diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 55fb554..1779eb8 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -10,9 +10,9 @@ var: export sysrootdir=/var/tmp/dist/[% project %]/SDK/ export clangdir=/var/tmp/dist/[% project %]/clang export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin - export PATH="$clangdir/helpers:$clangdir/bin:$cctoolsdir:$PATH" + export PATH="$clangdir/bin:$cctoolsdir:$PATH" export LD_LIBRARY_PATH=/var/tmp/dist/[% project %]/clang/lib - export CC="$clangdir/helpers/clang [% c('var/FLAGS') %]" + export CC="$clangdir/bin/clang [% c('var/FLAGS') %]" export LDFLAGS="[% c('var/LDFLAGS') %]" input_files: diff --git a/projects/openssl/build b/projects/openssl/build index e831b68..3851346 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -10,7 +10,7 @@ export CC='gcc -m32' [% END %] [% IF c("var/osx") -%] # Tricking OpenSSL into using our clang as cross-compiler - ln -s $clangdir/helpers/clang $clangdir/helpers/x86_64-apple-darwin10-cc + ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin10-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] ./Configure --prefix=$distdir [% c('var/configure_opts') %]

1 0

[tor-browser-build/master] Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge.
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 6aaeabc9d595afed06e77d96c5726e1fd6de72fd Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 12:55:15 2017 -0700 Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index fea436d..9cbb326 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -35,6 +35,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Bug 22468: Add default obfs4 bridges frosty and dragon.
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 7125ca7bdefed1a8cb93ab4c96f65557c7f3d095 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 13:45:58 2017 -0700 Bug 22468: Add default obfs4 bridges frosty and dragon. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 9cbb326..d2f4236 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -36,6 +36,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Bug 22398: Upgrade go to 1.8.3.
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 7519198c362ce6de859ad0ae9780ae5fd8dc1791 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 13:07:46 2017 +0200 Bug 22398: Upgrade go to 1.8.3. tor-browser-bundle.git author: David Fifield <david(a)bamsoftware.com> tor-browser-bundle.git commit: fbe1263eb9601e5d435131aa3d96306b8bfdb465 --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 1aa3052..4b09e95 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.8.1 +version: 1.8.3 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -77,7 +77,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 + sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[torbutton/master] Translations update
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 2164b84b0fc4d351e100f67e294c1ac87aff7957 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 2 10:11:13 2017 +0000 Translations update --- src/chrome/locale/ar/aboutTor.dtd | 2 +- src/chrome/locale/ar/torbutton.dtd | 2 +- src/chrome/locale/de/torbutton.dtd | 2 +- src/chrome/locale/es/torbutton.dtd | 2 +- src/chrome/locale/eu/torbutton.dtd | 2 +- src/chrome/locale/fa/brand.properties | 4 ++-- src/chrome/locale/fa/torbutton.dtd | 4 ++-- src/chrome/locale/fa/torbutton.properties | 10 +++++----- src/chrome/locale/fr/torbutton.dtd | 2 +- src/chrome/locale/it/torbutton.dtd | 2 +- src/chrome/locale/ja/torbutton.dtd | 10 +++++----- src/chrome/locale/ko/torbutton.dtd | 2 +- src/chrome/locale/nl/torbutton.dtd | 2 +- src/chrome/locale/pl/torbutton.dtd | 2 +- src/chrome/locale/pt-BR/torbutton.dtd | 2 +- src/chrome/locale/pt-BR/torbutton.properties | 2 +- src/chrome/locale/ru/torbutton.dtd | 2 +- src/chrome/locale/sv/aboutDialog.dtd | 2 +- src/chrome/locale/sv/aboutTBUpdate.dtd | 4 ++-- src/chrome/locale/sv/aboutTor.dtd | 2 +- src/chrome/locale/sv/brand.dtd | 8 ++++---- src/chrome/locale/sv/torbutton.dtd | 8 ++++---- src/chrome/locale/sv/torbutton.properties | 2 +- src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/tr/torbutton.properties | 2 +- src/chrome/locale/vi/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 4 ++-- 27 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index f6b8d96..c64915a 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -30,7 +30,7 @@ <!ENTITY aboutTor.whatnext.label "نصائح للحفاظ على سريّة هويتك »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "دليل استخدام متصفّح Tor"> <!ENTITY aboutTor.helpInfo1.label "بإمكانك المساعدة!"> <!ENTITY aboutTor.helpInfo2.label "يمكنك مساعدة شبكة تور و جعلها أكثر سرعة و قوّة بإحدي الطرق الآتية:"> <!ENTITY aboutTor.helpInfo3.label "شغّل نقطة تور »"> diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index e830297..d391ef7 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "في بعض المواقع من الممكن أن تحتاج لإستخدام زر تعطيل السكريبتات في شرط الأدوات لتفعل المحتويات المرئية."> <!ENTITY torbutton.prefs.sec_some_jit_desc "بعض محسنات نصوص الجافا معطلة"> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "سكربت في بعض المواقع قد تعمل بشكل بطيئ"> <!ENTITY torbutton.prefs.sec_mathml_desc "بعض الآليات لعرض معادلات رياضية معطلة."> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index cb967e1..5df06d0 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5-Video- und Audiomedien werden per Click-to-Play über NoScript abspielbar."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Auf manchen Webseiten müssen Sie möglicherweise die NoScript-Schaltfläche in der Werkzeugleiste verwenden, um diese Medienobjekte zu aktivieren."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Einige JavaScript-Ausführungsoptimierungen sind deaktiviert."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Typinferenz, asm.js."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT-Grundversion."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts können auf manchen Seiten langsamer laufen."> <!ENTITY torbutton.prefs.sec_mathml_desc "Manche Vorgänge zur Anzeige von mathematischen Gleichungen sind deaktiviert."> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index d5f13f9..4a8a081 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "Los medios de vídeo y audio HTML5 se vuelven tipo clic-para-reproducir mediante NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios puede que necesite usar el botón NoScript de la barra de herramientas para habilitar estos objetos audiovisuales."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Algunas optimizaciones de rendimiento de JavaScript están deshabilitadas."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT (compilador JS instantáneo optimizado), Type Inference (deducción del tipo de datos por el compilador), ASM.JS (JS intermedio para alto rendimiento de otros lenguajes)"> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT (compilador JS instantáneo optimizado), RegExp nativas."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT (compilador JS instantáneo)"> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Los scripts en algunos sitios puede que se ejecuten más lentamente."> <!ENTITY torbutton.prefs.sec_mathml_desc "Algunos mecanismos de representación de ecuaciones matemáticas están deshabilitados."> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 9ef6b04..00bbf76 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> diff --git a/src/chrome/locale/fa/brand.properties b/src/chrome/locale/fa/brand.properties index b0589eb..e9eb95f 100644 --- a/src/chrome/locale/fa/brand.properties +++ b/src/chrome/locale/fa/brand.properties @@ -5,7 +5,7 @@ brandShorterName=مرورگر تور brandShortName=مرورگر تور brandFullName=مرورگر تور -vendorShortName=پروژهٔ تور +vendorShortName=پروژه تور homePageSingleStartMain=صفحهٔ Firefox Start, صفحهٔ خانگی تند با موتور جستجو homePageImport=صفحه‌ٔ خانگیتان‌را از %S وارد كنيد @@ -13,4 +13,4 @@ homePageImport=صفحه‌ٔ خانگیتان‌را از %S وارد كنيد homePageMigrationPageTitle=انتخاب صفحهٔ خانگی homePageMigrationDescription=بفرمایید صفحهٔ خانگی انتخاب گنید: -syncBrandShortName=همگام‌سازی +syncBrandShortName=همگام‌ سازی diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 7b42e78..8d83d33 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "صدا و تصویر HTML5 از طریق دکمه NoScript نوار ابزار به حالت -کلیک برای پخش- در می آید"> <!ENTITY torbutton.prefs.sec_html5_tooltip "در برخی سایت ها، ممکن است شما نیاز به استفاده از دکمه NoScript نوار ابزار برای فعال کردن این اشیاء رسانه داشته باشید."> <!ENTITY torbutton.prefs.sec_some_jit_desc "برخی از بهینه سازی عملکرد جاوا اسکریپت غیر فعال شده است."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT در شروع مطالعه."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "اسکریپت هل در برخی از سایت ها ممکن است آهسته تر اجرا شود."> <!ENTITY torbutton.prefs.sec_mathml_desc "برخی مکانیسم ها نمایش معادلات ریاضی غیر فعال می باشد."> @@ -58,4 +58,4 @@ <!ENTITY torbutton.prefs.sec_all_js_desc "جاوا اسکریپت به طور پیش فرض در تمامی سایت ها غیر فعال است."> <!ENTITY torbutton.prefs.sec_webfonts_desc "برخی از فونت ها و آیکون های ممکن است نمایش نادرست داشته باشند."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "فایل های فونتی که در وب سایت ارائه می شوند مسدود شده است."> -<!ENTITY torbutton.circuit_display.title "مدار Tor برای این سایت"> +<!ENTITY torbutton.circuit_display.title "مدار تور برای این سایت"> diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index d809651..e21d475 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -2,14 +2,14 @@ torbutton.circuit_display.internet = اینترنت torbutton.circuit_display.ip_unknown = IP ناشناخته torbutton.circuit_display.onion_site = سایت پیاز torbutton.circuit_display.this_browser = این مرورگر -torbutton.circuit_display.relay = رله +torbutton.circuit_display.relay = بازپخش torbutton.circuit_display.tor_bridge = پل torbutton.circuit_display.unknown_country = کشور ناشناخته torbutton.content_sizer.margin_tooltip = مرورگر Tor اضافه می کند این حاشیه را به عرض و ارتفاع پنجره شما که کمتر مشخص شود، و در نتیجه باعث کاهش توانایی به ردیابی آنلاین شما شود. -torbutton.panel.tooltip.disabled = برای فعال کردن تُرکليک کنيد -torbutton.panel.tooltip.enabled = برای غيرفعال کردن تُر کليک کنيد -torbutton.panel.label.disabled = تُرغيرفعال شد -torbutton.panel.label.enabled = تُر فعال شد +torbutton.panel.tooltip.disabled = برای فعال کردن تور کليک کنيد +torbutton.panel.tooltip.enabled = برای غيرفعال کردن تور کليک کنيد +torbutton.panel.label.disabled = تور غیر فعال شد +torbutton.panel.label.enabled = تور فعال شد extensions.torbutton(a)torproject.org.description = Torbutton دکمه ای را برای شما فراهم مینماید تا تنظیمات "تر" را پیکربندی کرده و بتوانید به راحتی و سرعت، داده های خصوصی مرورگرتان را پاک کنید. torbutton.popup.external.title = میخواهید یک فایل نوع بیرونی دانلود شود؟ torbutton.popup.external.app = مرورگر نمیتواند این فایل را نمایش دهد، لازم است تا با برنامه دیگری آن را باز کنید.\n diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index bd9782a..53e1c33 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "Le contenu HTML5 vidéo et audio devient « cliquer pour lire » avec NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Pour certains sites, vous aurez peut-être à utiliser le bouton NoScript de la barre d'outils pour activer ces objets multimédias."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Certaines optimisations de performance de JavaScript sont désactivées."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, inférence de type, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts pourraient être exécutés plus lentement sur certains sites."> <!ENTITY torbutton.prefs.sec_mathml_desc "Certains mécanismes d'affichage des équations mathématiques sont désactivés."> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 33cf271..8f42fbc 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "I video e audio in HTML5 diventano click-to-play grazie a NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Su alcuni siti, potresti dover usare il pulsante toolbar di NoScript per attivare quei media."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Alcune ottimizzazioni di performance JavaScript sono disabilitate."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Gli scripts su alcuni siti possono girare più lenti."> <!ENTITY torbutton.prefs.sec_mathml_desc "Alcuni meccanismi di visualizzazione di equazioni matematiche sono disabilitati."> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index d5ad0d9..d0a6940 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -2,7 +2,7 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "このサイト用の新しい Tor サーキット"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "セキュリティの設定..."> <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Torネットワークの設定..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> @@ -11,9 +11,9 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie の防御"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbuttonを初期状態に戻す"> -<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.security_settings "Tor Browser セキュリティの設定"> +<!ENTITY torbutton.prefs.restore_defaults "デフォルトにもどす"> +<!ENTITY torbutton.prefs.custom_warning "あなたのブラウザーにおけるカスタム設定はセキュリティ結果に影響を及ぼしません。セキュリティとプライバシーに関してはデフォルトのセキュリティレベルのひとつを選択することをおすすめいたします。"> <!ENTITY torbutton.cookiedialog.title "Cookie保護を管理"> <!ENTITY torbutton.cookiedialog.lockCol "保護済み"> <!ENTITY torbutton.cookiedialog.domainCol "ホスト"> @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 の映像と音楽は No-Script によりクリックするまで再生されません。"> <!ENTITY torbutton.prefs.sec_html5_tooltip "いくつかのサイトでは、メディアを有効にするために No-Script ツールバーを使う必要があります。"> <!ENTITY torbutton.prefs.sec_some_jit_desc "いくつかの JavaScript のパフォーマンス最適化が無効化されます。"> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、型インターフェイス、ASM.JS。"> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "基本的なJIT。"> <!ENTITY torbutton.prefs.sec_jit_slower_desc "サイトによってはスクリプトの動作が遅くなります。"> <!ENTITY torbutton.prefs.sec_mathml_desc "数式を表示するためのいくつかの機能が無効化されます。"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index aa86374..6afe330 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> <!ENTITY torbutton.prefs.sec_some_jit_desc "일부 JavaScript 의 성능 최적화가 비활성화되었습니다."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline (베이스라인) JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "일부 사이트의 스크립트 동작이 느려질 수 있습니다."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 414db45..f70158f 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5-video en -audio worden klik-om-af-te-spelen via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Op sommige sites moet je de NoScript-werkbalkknop gebruiken om deze media-objecten in te schakelen."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Sommige JavaScript-prestatieverbeteringen zijn uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts kunnen op sommige websites trager zijn."> <!ENTITY torbutton.prefs.sec_mathml_desc "Sommige mechanismen voor het weergeven van wiskundige vergelijkingen zijn uitgeschakeld."> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index f9d4b83..0579185 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video oraz audio będą dostępne jako 'kliknij-aby-otworzyć' przez NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Na niektórych stronach internetowych będziesz musiał użyć przycisku NoScript znajdującym się w pasku narzędzi, aby włączyć dane obiekty medialne."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Niektóre optymalizacje wydajności JavaScript są wyłączone."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skrypty na niektórych stronach mogą działać wolniej."> <!ENTITY torbutton.prefs.sec_mathml_desc "Niektóre mechanizmy wyświetlania równań matematycznych są wyłączone."> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index bf0664b..88e194a 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video e mídia de audio torna-se clique-para-tocar através do NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Em alguns sites, talvez você precise usar o botão da barra de ferramentas NoScript para habilitar esses objetos de mídia."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Algumas otimizações de perfomance JavaScript estão desabilitadas."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Tipo de Inferência, ASM JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de Base JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts podem rodar mais devagar em alguns sites."> <!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos para mostrar equações matemáticas estão desabilitados."> diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties index 5cfb0af..6c61a97 100644 --- a/src/chrome/locale/pt-BR/torbutton.properties +++ b/src/chrome/locale/pt-BR/torbutton.properties @@ -19,7 +19,7 @@ torbutton.popup.launch = Fazer o download do arquivo torbutton.popup.cancel = Cancelar torbutton.popup.dontask = Fazer o download dos arquivos automaticamente de agora em diante torbutton.popup.prompted_language = Para proporcionar-lhe mais privacidade, o Torbutton pode requisitar a versão em inglês das páginas da web. Isso pode fazer com que as páginas que você prefere ler na sua língua nativa apareçam em Inglês. -torbutton.popup.no_newnym = O Torbutton não pode dar-lhe uma nova identidade com segurança. Ele não tem acesso à Porta de Controle do Tor.\n\nVocê está usando o Pacote do Navegador Tor? +torbutton.popup.no_newnym = O Torbutton não pode lhe dar uma nova identidade com segurança. Ele não tem acesso à Porta de Controle do Tor.\n\nVocê está usando o Pacote do Navegador Tor? torbutton.title.prompt_torbrowser = Informação importante do Torbutton torbutton.popup.prompt_torbrowser = O Torbutton agora está funcionando de outra maneira: você não pode mais desligá-lo.\n\nNós fizemos esta mudança porque não é seguro usar o Torbutton em um navegador que também é usado para navegação não-Tor. Havia muitos bugs que nós não conseguíamos resolver de nenhum outro modo.\n\nSe você quiser continuar usando o Firefox normalmente, deverá desinstalar o Torbutton e fazer o download do Pacote do Navegador Tor. As configurações de privacidade do Navegador Tor também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá até Ferramentas->Complementos->Extensões e clique no botão Remover próximo ao Torbutton. torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora estará sempre habilitado.\n\nClique no Torbutton para mais informações. diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index a67ce46..585cd29 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 видео и аудио воспроизводятся только после щелчка благодаря NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "На некоторых сайтах, вам может потребоваться использовать кнопку NoScript панели инструментов, чтобы включить эти мультимедийные объекты."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Некоторые оптимизации производительности JavaScript отключены."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Базовый JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Сценарии на некоторых сайтах могут работать медленнее."> <!ENTITY torbutton.prefs.sec_mathml_desc "Некоторые механизмы отображения математических уравнений отключены."> diff --git a/src/chrome/locale/sv/aboutDialog.dtd b/src/chrome/locale/sv/aboutDialog.dtd index 808e769..bc3c8aa 100644 --- a/src/chrome/locale/sv/aboutDialog.dtd +++ b/src/chrome/locale/sv/aboutDialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "&brandShortName; utvecklas av">  <!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end ", en idéell verksamhet som arbetar för att försvara din frihet och integritet online."> +<!ENTITY project.end ", en idéell verksamhet som arbetar för att försvara din frihet och integritet på nätet."> <!ENTITY help.start "Vill du hjälpa till?">  diff --git a/src/chrome/locale/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv/aboutTBUpdate.dtd index c502721..a57f256 100644 --- a/src/chrome/locale/sv/aboutTBUpdate.dtd +++ b/src/chrome/locale/sv/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser-uppdatering"> -<!ENTITY aboutTBUpdate.updated "Tor Browser har uppdaterats."> +<!ENTITY aboutTBUpdate.title "Tor-webbläsaruppdatering"> +<!ENTITY aboutTBUpdate.updated "Tor-webbläsaren har uppdaterats."> <!ENTITY aboutTBUpdate.linkPrefix "För den senaste information om den här versionen,"> <!ENTITY aboutTBUpdate.linkLabel "besök vår hemsida"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 446f198..1e4b30f 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -12,7 +12,7 @@ <!ENTITY aboutTor.check.label "Testa nätverksinställningarna för Tor"> -<!ENTITY aboutTor.success.label "Välkommen till Tor Browser"> +<!ENTITY aboutTor.success.label "Välkommen till Tor-webbläsaren"> <!ENTITY aboutTor.success2.label "Ansluten till Tor-nätverket."> <!ENTITY aboutTor.success3.label "Du kan nu surfa på nätet anonymt."> <!ENTITY aboutTor.failure.label "Någonting gick fel!"> diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv/brand.dtd index c04310a..43a95e1 100644 --- a/src/chrome/locale/sv/brand.dtd +++ b/src/chrome/locale/sv/brand.dtd @@ -2,11 +2,11 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor webbläsaren"> -<!ENTITY brandShortName "Tor webbläsaren"> -<!ENTITY brandFullName "Tor webbläsaren"> +<!ENTITY brandShorterName "Tor-webbläsaren"> +<!ENTITY brandShortName "Tor-webbläsaren"> +<!ENTITY brandFullName "Tor-webbläsare"> <!ENTITY vendorShortName "Tor-projektet"> -<!ENTITY trademarkInfo.part1 "Firefox och Firefox-logotypen är varumärken som tillhör Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "Firefox och Firefox-logotyperna är varumärken som tillhör Mozilla Foundation.">  <!ENTITY plugins.installed.find "Klicka här för att ladda installerade systemtillägg."> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 4560ccc..75612ae 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -1,10 +1,10 @@ <!ENTITY torbutton.context_menu.new_identity "Ny identitet"> <!ENTITY torbutton.context_menu.new_identity_key "N"> -<!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för den här webbsidan"> +<!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för den här webbplatsen"> <!ENTITY torbutton.context_menu.new_circuit_key "S"> <!ENTITY torbutton.context_menu.preferences "Säkerhetsinställningar..."> <!ENTITY torbutton.context_menu.preferences.key "S"> -<!ENTITY torbutton.context_menu.networksettings "Tor nätverksinställningar..."> +<!ENTITY torbutton.context_menu.networksettings "Tor-nätverksinställningar..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Sök efter uppdateringar för Tor webbläsare..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 ljud- och bildmedia blir click-to-play via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "På vissa webbsidor kan du vara tvungen att aktivera dessa mediatyper via NoScript-knappen."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Vissa prestandaoptimeringar av JavaScript är inaktiverade."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript på vissa webbsidor kan gå långsammare."> <!ENTITY torbutton.prefs.sec_mathml_desc "Vissa funktioner för att visa matematiska formler är avaktiverade."> @@ -58,4 +58,4 @@ <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript är normalt avaktiverat på alla webbsidor."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Vissa typsnitt ock ikoner kan visas felaktigt."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbsidor är blockerade."> -<!ENTITY torbutton.circuit_display.title "Tor-krets för den här webbsidan"> +<!ENTITY torbutton.circuit_display.title "Tor-krets för den här webbplatsen"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index e04426e..8102e83 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -34,7 +34,7 @@ torbutton.slider_notification_button = Öppna säkerhetsinställningar torbutton.maximize_warning = Att maximera Tor Browser kan ge webbsajter möjlighet att upptäcka din monitors storlek, vilket kan användas för att spåra dig. Vi rekommenderar att du lämnar Tor Browser fönstret i dess ursprungliga storlek. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Denna webbsida (%S) försökte komma åt HTML5-bilddata på ett kanvas, som skulle kunna användas för att identifiera just din dator.\n\nSka Tor Browser tillåta den här webbsidan att använda HTML5-bilddata på kanvas? +canvas.siteprompt=Denna webbplats (%S) försökte komma åt HTML5-bilddata på ett kanvas, som skulle kunna användas för att identifiera just din dator.\n\nSka Tor Browser tillåta den här webbplatsen att använda HTML5-bilddata på kanvas? canvas.notNow=Inte just nu canvas.notNowAccessKey=N canvas.allow=Ja, tillåt alltid diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 116e0fc..0d860bd 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 görüntü ve ses ortamı NoScript aracılığıyla tıklayıp oynat şekline dönüştürülür."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Bazı sitelerde bu ortam nesnelerini etkinleştirebilmek için NoScript düğmesinin kullanılması gerekebilir."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Bazı JavaScript başarım iyileştirmeleri devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Doğal Düzenli İfade."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Sınır Çizgi JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Bazı sitelerde betikler daha yavaş çalışabilir."> <!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini görüntüleyen bazı düzenekler devre dışı bırakılır."> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index 357a6eb..b228a64 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -14,7 +14,7 @@ extensions.torbutton(a)torproject.org.description = Torbutton, Tor ayarlarını ya torbutton.popup.external.title = Dış bir dosya türü indirilsin mi? torbutton.popup.external.app = Tor Browser bu dosyayı görüntüleyemiyor. Başka bir uygulamayla açmanız gerekecek.\n torbutton.popup.external.note = Bazı dosya türleri uygulamaların Tor kullanmadan İnternet bağlantısı kurmasına neden olabilir.\n -torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları yalnız çevrim dışı iken açmalı ya da Tails benzeri bir Çalışan Tor CD ortamı kullanmalısınız.\n +torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları yalnız çevrimdışı iken açmalı ya da Tails benzeri bir Çalışan Tor CD ortamı kullanmalısınız.\n torbutton.popup.launch = Dosyayı indir torbutton.popup.cancel = İptal\n torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index 5508973..992e1ec 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "Video và âm thanh truyền thông HTML5 có thể trở thành nhấp để phát qua NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Trên một số trang, có thể bạn cần phải dùng nút thanh công cụ NoScript để kích hoạt những đối tượng đa phương tiện này."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Một số tối ưu hoá JavaScript bị vô hiệu."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Những đoạn mã trên một số trang có thể chạy chậm hơn."> <!ENTITY torbutton.prefs.sec_mathml_desc "Một vài cơ chế hiển thị công thức toán học bị vô hiệu."> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 0977b3d..d61cd9c 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -12,7 +12,7 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> <!ENTITY torbutton.prefs.security_settings "Tor 浏览器安全设置"> -<!ENTITY torbutton.prefs.restore_defaults "恢复默认值"> +<!ENTITY torbutton.prefs.restore_defaults "恢复默认"> <!ENTITY torbutton.prefs.custom_warning "您自定义的浏览器设置导致了不安全的安全设置。出于安全和隐私考虑，我们建议您选择一个默认的安全级别。"> <!ENTITY torbutton.cookiedialog.title "管理受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "受保护"> @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频需通过 NoScript 点击播放。"> <!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可通过 NoScript 工具栏按钮播放这些媒体。"> <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT，原生正则表达式。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> <!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会缓执行。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。">

1 0

[tor-browser-bundle/maint-7.0] Bug 22328: remove clang PIE wrappers
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 2b6992cf9aedafd4a121ff820aba182d0906c593 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 11:31:16 2017 +0200 Bug 22328: remove clang PIE wrappers Those wrappers are no longer necessary to produce PIE binaries. --- gitian/descriptors/mac/gitian-firefox.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index efa7acf..73c46bf 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -40,22 +40,6 @@ script: | tar xaf ../MacOSX10.7.sdk.tar.gz tar xaf ../cctools.tar.gz unzip ../clang-linux64-jessie-utils.zip - # Bug 20439: build with PIE - # If we add -fPIE to the FLAGS, the build fails in js/src/ctypes/libffi - # with libtool giving an error: - # libtool: compile: unable to infer tagged configuration - # To avoid this error, we add -fPIE using wrappers on clang and clang++ - mv clang/bin/clang clang/bin/clang.real - mv clang/bin/clang++ clang/bin/clang++.real - cat > clang/bin/clang << EOF - #!/bin/sh - exec $(pwd)/clang/bin/clang.real -fPIE "\$@" - EOF - cat > clang/bin/clang++ << EOF - #!/bin/sh - exec $(pwd)/clang/bin/clang++.real -fPIE "\$@" - EOF - chmod +x clang/bin/clang clang/bin/clang++ # TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*}

1 0

[tor-browser-bundle/master] Bug 22328: remove clang PIE wrappers
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit e8618a272b8ce8c8de834314b31a2fdd9259513a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 11:31:16 2017 +0200 Bug 22328: remove clang PIE wrappers Those wrappers are no longer necessary to produce PIE binaries. --- gitian/descriptors/mac/gitian-firefox.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index efa7acf..73c46bf 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -40,22 +40,6 @@ script: | tar xaf ../MacOSX10.7.sdk.tar.gz tar xaf ../cctools.tar.gz unzip ../clang-linux64-jessie-utils.zip - # Bug 20439: build with PIE - # If we add -fPIE to the FLAGS, the build fails in js/src/ctypes/libffi - # with libtool giving an error: - # libtool: compile: unable to infer tagged configuration - # To avoid this error, we add -fPIE using wrappers on clang and clang++ - mv clang/bin/clang clang/bin/clang.real - mv clang/bin/clang++ clang/bin/clang++.real - cat > clang/bin/clang << EOF - #!/bin/sh - exec $(pwd)/clang/bin/clang.real -fPIE "\$@" - EOF - cat > clang/bin/clang++ << EOF - #!/bin/sh - exec $(pwd)/clang/bin/clang++.real -fPIE "\$@" - EOF - chmod +x clang/bin/clang clang/bin/clang++ # TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*}

1 0

[torbutton/master] Bug 22104: Adjust our content policy whitelist for ff52-esr.
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 46947ad2a818a89643d75ca2397feb39fc6ef8c3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jun 1 12:28:50 2017 -0400 Bug 22104: Adjust our content policy whitelist for ff52-esr. Fix problems with missing video playback controls and missing scrollbars. Use a regex solution to allow access to all png images, svg images, and css files under chrome://global/skin/media. --- src/components/content-policy.js | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index b2fdff7..db72efe 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -43,23 +43,36 @@ ContentPolicy.prototype = { // Video playback. "chrome://global/content/TopLevelVideoDocument.js": Ci.nsIContentPolicy.TYPE_SCRIPT, "resource://gre/res/TopLevelVideoDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - "chrome://global/skin/media/TopLevelVideoDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, "chrome://global/content/bindings/videocontrols.xml": Ci.nsIContentPolicy.TYPE_XBL, "chrome://global/content/bindings/scale.xml": Ci.nsIContentPolicy.TYPE_XBL, "chrome://global/content/bindings/progressmeter.xml": Ci.nsIContentPolicy.TYPE_XBL, + "chrome://global/content/bindings/button.xml": Ci.nsIContentPolicy.TYPE_XBL, + "chrome://global/content/bindings/general.xml": Ci.nsIContentPolicy.TYPE_XBL, + "chrome://global/content/bindings/text.xml": Ci.nsIContentPolicy.TYPE_XBL, // Image display. "resource://gre/res/ImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, "resource://gre/res/TopLevelImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - "chrome://global/skin/media/TopLevelImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - // Resizing text boxes. + // Scrollbars, text box resizer, and content keyboard shortcuts. + "chrome://global/content/bindings/scrollbar.xml": Ci.nsIContentPolicy.TYPE_XBL, "chrome://global/content/bindings/resizer.xml": Ci.nsIContentPolicy.TYPE_XBL, + "chrome://global/content/platformHTMLBindings.xml": Ci.nsIContentPolicy.TYPE_XBL, // Directory listing. "chrome://global/skin/dirListing/dirListing.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, }, + uriRegexWhitelist: [ + // Video playback: whitelist png and svg images under chrome://global/skin/media + { regex: /^chrome:\/\/global\/skin\/media\/.+\.(png|svg)$/, + type: Ci.nsIContentPolicy.TYPE_IMAGE }, + + // Video playback and image display: whitelist css files under chrome://global/skin/media + { regex: /^chrome:\/\/global\/skin\/media\/.+\.css$/, + type: Ci.nsIContentPolicy.TYPE_STYLESHEET }, + ], + // nsISupports QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy, Ci.nsIFactory, Ci.nsISupportsWeakReference]), @@ -105,6 +118,11 @@ ContentPolicy.prototype = { if (this.uriWhitelist[aContentLocation.spec] == aContentType) return Ci.nsIContentPolicy.ACCEPT; + for (let wlObj of this.uriRegexWhitelist) { + if ((wlObj.type == aContentType) && wlObj.regex.test(aContentLocation.spec)) + return Ci.nsIContentPolicy.ACCEPT; + } + return Ci.nsIContentPolicy.REJECT_REQUEST; },

1 0

[tor-browser-bundle/master] Bug 22468: Add default obfs4 bridges frosty and dragon.
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 092f632376a3d7c3fe32014c7d99317d40ee3374 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 13:45:58 2017 -0700 Bug 22468: Add default obfs4 bridges frosty and dragon. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 9cbb326..d2f4236 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -36,6 +36,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/maint-7.0] Bug 22468: Add default obfs4 bridges frosty and dragon.
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 245852ffb22232effed9ec44bc9e4dde935fd125 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 13:45:58 2017 -0700 Bug 22468: Add default obfs4 bridges frosty and dragon. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index add6448..0a363cd 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -36,6 +36,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/maint-7.0] Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge.
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 94947a1c2333c4dcf0a0bf8af6228aceaf437ad2 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 12:55:15 2017 -0700 Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 48d3465..add6448 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -35,6 +35,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge.
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 6dbe2e65a8d5822d024669e90d7f920b453adce4 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 12:55:15 2017 -0700 Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index fea436d..9cbb326 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -35,6 +35,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 16485: Improve about:cache page
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit e1f39122d16e5cd69dd11732d8fb2faf5087fdd2 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 31 08:58:30 2017 +0000 Bug 16485: Improve about:cache page Loading `about:cache` and selecting particular caches via the checkboxes results in a cryptic error ("Unrecognized storage name 'null' in about:cache URL) when updating the page. We avoid that by making sure the storage parameter is in fact empty if it is supposed to be `null`. --- toolkit/components/aboutcache/content/aboutCache.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/toolkit/components/aboutcache/content/aboutCache.js b/toolkit/components/aboutcache/content/aboutCache.js index 07067cc..425e570 100644 --- a/toolkit/components/aboutcache/content/aboutCache.js +++ b/toolkit/components/aboutcache/content/aboutCache.js @@ -40,5 +40,13 @@ function navigate() if ($('priv').checked) context += 'p,'; + // Checking any of the checkboxes and hitting "Update" after `about:cache` got + // loaded should not result in a cryptic error ("Unrecognized storage name + // 'null' in about:cache URL"). Rather, the related list of entries in all + // caches should be made visible. + if (storage == null) { + storage="" + } + window.location.href = 'about:cache?storage=' + storage + '&context=' + context; }

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 16485: Improve about:cache page
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 9607f989206d048c9905d1b19cedf9913750c6c7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 31 08:58:30 2017 +0000 Bug 16485: Improve about:cache page Loading `about:cache` and selecting particular caches via the checkboxes results in a cryptic error ("Unrecognized storage name 'null' in about:cache URL) when updating the page. We avoid that by making sure the storage parameter is in fact empty if it is supposed to be `null`. --- toolkit/components/aboutcache/content/aboutCache.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/toolkit/components/aboutcache/content/aboutCache.js b/toolkit/components/aboutcache/content/aboutCache.js index 07067cc..425e570 100644 --- a/toolkit/components/aboutcache/content/aboutCache.js +++ b/toolkit/components/aboutcache/content/aboutCache.js @@ -40,5 +40,13 @@ function navigate() if ($('priv').checked) context += 'p,'; + // Checking any of the checkboxes and hitting "Update" after `about:cache` got + // loaded should not result in a cryptic error ("Unrecognized storage name + // 'null' in about:cache URL"). Rather, the related list of entries in all + // caches should be made visible. + if (storage == null) { + storage="" + } + window.location.href = 'about:cache?storage=' + storage + '&context=' + context; }

1 0

[torbutton/master] Bug 22457: Allow resources loaded by view-source://
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 137c0527b1d152c5999db53894badc54ab9e34c9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 1 09:26:11 2017 +0000 Bug 22457: Allow resources loaded by view-source:// Instead of whitelisting single resources for view-source requests that might allow platform detection we allow all of those that are needed by requests with a view-source origin. This should be safe now that https://bugzilla.mozilla.org/show_bug.cgi?id=1172165 landed. --- src/components/content-policy.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index a63919c..b2fdff7 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -83,8 +83,12 @@ ContentPolicy.prototype = { return Ci.nsIContentPolicy.ACCEPT; } - // Accept if no origin URI or if origin scheme is chrome/resource/about. - if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || aRequestOrigin.schemeIs('chrome') || aRequestOrigin.schemeIs('about')) + // Accept if no origin URI or if origin scheme is + // chrome/resource/about/view-source. + if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || + aRequestOrigin.schemeIs('chrome') || + aRequestOrigin.schemeIs('about') || + aRequestOrigin.schemeIs('view-source')) return Ci.nsIContentPolicy.ACCEPT; // Accept if resource directly loaded into a tab.

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 21862: Rip out potentially unsafe rust code
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 88c25c56d96f8fc0801359358d808f0d0e7d4b93 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 24 14:30:03 2017 +0000 Bug 21862: Rip out potentially unsafe rust code Just ripping out the problematic code leads to compile errors complaining about modified third party code. That's fine for now, though we need to think harder about this issue once we start building with Rust being mandatory. --- third_party/rust/url/src/host.rs | 22 +--------------------- third_party/rust/url/src/lib.rs | 11 +---------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/third_party/rust/url/src/host.rs b/third_party/rust/url/src/host.rs index 47b049a..f2de780 100644 --- a/third_party/rust/url/src/host.rs +++ b/third_party/rust/url/src/host.rs @@ -10,7 +10,7 @@ use std::cmp; use std::fmt::{self, Formatter}; use std::io; -use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs}; +use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; use std::vec; use parser::{ParseResult, ParseError}; use percent_encoding::percent_decode; @@ -135,26 +135,6 @@ impl<'a> HostAndPort<&'a str> { } } -impl<S: AsRef<str>> ToSocketAddrs for HostAndPort<S> { - type Iter = SocketAddrs; - - fn to_socket_addrs(&self) -> io::Result<Self::Iter> { - let port = self.port; - match self.host { - Host::Domain(ref domain) => Ok(SocketAddrs { - // FIXME: use std::net::lookup_host when it’s stable. - state: SocketAddrsState::Domain(try!((domain.as_ref(), port).to_socket_addrs())) - }), - Host::Ipv4(address) => Ok(SocketAddrs { - state: SocketAddrsState::One(SocketAddr::V4(SocketAddrV4::new(address, port))) - }), - Host::Ipv6(address) => Ok(SocketAddrs { - state: SocketAddrsState::One(SocketAddr::V6(SocketAddrV6::new(address, port, 0, 0))) - }), - } - } -} - /// Socket addresses for an URL. pub struct SocketAddrs { state: SocketAddrsState diff --git a/third_party/rust/url/src/lib.rs b/third_party/rust/url/src/lib.rs index 9378318..51607e4 100644 --- a/third_party/rust/url/src/lib.rs +++ b/third_party/rust/url/src/lib.rs @@ -130,7 +130,7 @@ use std::fmt::{self, Write}; use std::hash; use std::io; use std::mem; -use std::net::{ToSocketAddrs, IpAddr}; +use std::net::IpAddr; use std::ops::{Range, RangeFrom, RangeTo}; use std::path::{Path, PathBuf}; use std::str; @@ -1191,15 +1191,6 @@ impl Url { } } -/// Return an error if `Url::host` or `Url::port_or_known_default` return `None`. -impl ToSocketAddrs for Url { - type Iter = SocketAddrs; - - fn to_socket_addrs(&self) -> io::Result<Self::Iter> { - try!(self.with_default_port(|_| Err(()))).to_socket_addrs() - } -} - /// Parse a string as an URL, without a base URL or encoding override. impl str::FromStr for Url { type Err = ParseError;

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 21862: Rip out potentially unsafe rust code
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 78aa6185cd8d1d11e09495f6e4dc5cbc19e80cba Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 24 14:30:03 2017 +0000 Bug 21862: Rip out potentially unsafe rust code Just ripping out the problematic code leads to compile errors complaining about modified third party code. That's fine for now, though we need to think harder about this issue once we start building with Rust being mandatory. --- third_party/rust/url/src/host.rs | 22 +--------------------- third_party/rust/url/src/lib.rs | 11 +---------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/third_party/rust/url/src/host.rs b/third_party/rust/url/src/host.rs index 47b049a..f2de780 100644 --- a/third_party/rust/url/src/host.rs +++ b/third_party/rust/url/src/host.rs @@ -10,7 +10,7 @@ use std::cmp; use std::fmt::{self, Formatter}; use std::io; -use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs}; +use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; use std::vec; use parser::{ParseResult, ParseError}; use percent_encoding::percent_decode; @@ -135,26 +135,6 @@ impl<'a> HostAndPort<&'a str> { } } -impl<S: AsRef<str>> ToSocketAddrs for HostAndPort<S> { - type Iter = SocketAddrs; - - fn to_socket_addrs(&self) -> io::Result<Self::Iter> { - let port = self.port; - match self.host { - Host::Domain(ref domain) => Ok(SocketAddrs { - // FIXME: use std::net::lookup_host when it’s stable. - state: SocketAddrsState::Domain(try!((domain.as_ref(), port).to_socket_addrs())) - }), - Host::Ipv4(address) => Ok(SocketAddrs { - state: SocketAddrsState::One(SocketAddr::V4(SocketAddrV4::new(address, port))) - }), - Host::Ipv6(address) => Ok(SocketAddrs { - state: SocketAddrsState::One(SocketAddr::V6(SocketAddrV6::new(address, port, 0, 0))) - }), - } - } -} - /// Socket addresses for an URL. pub struct SocketAddrs { state: SocketAddrsState diff --git a/third_party/rust/url/src/lib.rs b/third_party/rust/url/src/lib.rs index 9378318..51607e4 100644 --- a/third_party/rust/url/src/lib.rs +++ b/third_party/rust/url/src/lib.rs @@ -130,7 +130,7 @@ use std::fmt::{self, Write}; use std::hash; use std::io; use std::mem; -use std::net::{ToSocketAddrs, IpAddr}; +use std::net::IpAddr; use std::ops::{Range, RangeFrom, RangeTo}; use std::path::{Path, PathBuf}; use std::str; @@ -1191,15 +1191,6 @@ impl Url { } } -/// Return an error if `Url::host` or `Url::port_or_known_default` return `None`. -impl ToSocketAddrs for Url { - type Iter = SocketAddrs; - - fn to_socket_addrs(&self) -> io::Result<Self::Iter> { - try!(self.with_default_port(|_| Err(()))).to_socket_addrs() - } -} - /// Parse a string as an URL, without a base URL or encoding override. impl str::FromStr for Url { type Err = ParseError;

1 0