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

[tor-browser-bundle/maint-5.5] Release preparations for 5.5.5
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit f98b5e82b3244b58d9e9c5be5ce810ca27b06658 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 21 06:50:30 2016 +0000 Release preparations for 5.5.5 Changelog update, versions bumps, config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ gitian/versions | 10 +++++----- tools/update-responses/config.yml | 11 +++++------ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3796be0..ef982de 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 5.5.5 -- April 26 2016 + * All Platforms + * Update Firefox to 38.8.0esr + * Update Tor Launcher to 0.2.7.9 + * Bug 10534: Don't advertise the help desk directly anymore + * Translation updates + * Update HTTPS-Everywhere to 5.1.6 + * Bug 18726: Add new default obfs4 bridge (GreenBelt) + Tor Browser 5.5.4 -- March 16 2016 * All Platforms * Update Firefox to 38.7.1esr diff --git a/gitian/versions b/gitian/versions index 1fefb42..8cf38e0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -7,15 +7,15 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.7.1esr +FIREFOX_VERSION=38.8.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 TOR_TAG=tor-0.2.7.6 -TORLAUNCHER_TAG=0.2.7.8 +TORLAUNCHER_TAG=0.2.7.9 TORBUTTON_TAG=1.9.4.5 -HTTPSE_TAG=5.1.4 +HTTPSE_TAG=5.1.6 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -59,7 +59,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -93,7 +93,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 +NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 943a367..138aa50 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -12,13 +12,12 @@ channels: alpha: 5.5a6 release: 5.5.4 versions: - 5.5.4: - platformVersion: 38.7.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-554-released - download_url: https://www.torproject.org/dist/torbrowser/5.5.4 + 5.5.5: + platformVersion: 38.8.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-555-released + download_url: https://www.torproject.org/dist/torbrowser/5.5.5 incremental_from: - - 5.5.2 - - 5.5.3 + - 5.5.4 migrate_archs: osx32: osx64 osx32:

1 0

[tor-launcher/maint-0.2.9] Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit e9ed8e28de7963d825a743257c0e00f89106137c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 14 11:15:43 2016 -0400 Bug 13252 - Do not store data in the app bundle Add support for a "side-by-side" directory structure where the writable data is stored in the TorBrowser-Data/ directory next to the application directory. --- src/chrome/locale/en/torlauncher.properties | 6 +- src/components/tl-process.js | 232 +++++++++++++++++++++------- src/defaults/preferences/prefs.js | 9 +- 3 files changed, 184 insertions(+), 63 deletions(-) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 216c962..7adb5a7 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -16,6 +16,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", + "resource://gre/modules/FileUtils.jsm"); function TorProcessService() { @@ -290,7 +292,11 @@ TorProcessService.prototype = mProtocolSvc: null, mTorProcess: null, // nsIProcess mTorProcessStartTime: null, // JS Date.now() - mTorFileBaseDir: null, // nsIFile (cached) + // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used. + // (cached; access via this._isUserDataOutsideOfAppDir) + mIsUserDataOutsideOfAppDir: undefined, + mAppDir: null, // nsIFile (cached; access via this._appDir) + mDataDir: null, // nsIFile (cached; access via this._dataDir) mControlConnTimer: null, mControlConnDelayMS: 0, mQuitSoon: false, // Quit was requested by the user; do so soon. @@ -309,10 +315,13 @@ TorProcessService.prototype = // Ideally, we would cd to the Firefox application directory before // starting tor (but we don't know how to do that). Instead, we // rely on the TBB launcher to start Firefox from the right place. - var exeFile = this._getTorFile("tor"); - var torrcFile = this._getTorFile("torrc"); - var torrcDefaultsFile = this._getTorFile("torrc-defaults"); - var dataDir = this._getTorFile("tordatadir"); + + // Get the Tor data directory first so it is created before we try to + // construct paths to files that will be inside it. + var dataDir = this._getTorFile("tordatadir", true); + var exeFile = this._getTorFile("tor", false); + var torrcFile = this._getTorFile("torrc", true); + var torrcDefaultsFile = this._getTorFile("torrc-defaults", false); var hashedPassword = this.mProtocolSvc.TorGetPassword(true); var detailsKey; @@ -335,11 +344,13 @@ TorProcessService.prototype = return; } - var geoipFile = dataDir.clone(); - geoipFile.append("geoip"); - var geoip6File = dataDir.clone(); - geoip6File.append("geoip6"); + // The geoip and geoip6 files are in the same directory as torrc-defaults. + var geoipFile = torrcDefaultsFile.clone(); + geoipFile.leafName = "geoip"; + + var geoip6File = torrcDefaultsFile.clone(); + geoip6File.leafName = "geoip6"; var args = []; if (torrcDefaultsFile) @@ -642,25 +653,65 @@ TorProcessService.prototype = }, // Returns an nsIFile. - // If file doesn't exist, null is returned. - _getTorFile: function(aTorFileType) + // If aCreate is true and the file doesn't exist, it is created. + _getTorFile: function(aTorFileType, aCreate) { if (!aTorFileType) return null; - var isRelativePath = true; - var prefName = "extensions.torlauncher." + aTorFileType + "_path"; - var path = TorLauncherUtil.getCharPref(prefName); + let isRelativePath = true; + let isUserData = (aTorFileType != "tor") && + (aTorFileType != "torrc-defaults"); + let prefName = "extensions.torlauncher." + aTorFileType + "_path"; + let path = TorLauncherUtil.getCharPref(prefName); if (path) { - var re = (TorLauncherUtil.isWindows) ? /^[A-Za-z]:\\/ : /^\//; + let re = (TorLauncherUtil.isWindows) ? /^[A-Za-z]:\\/ : /^\//; isRelativePath = !re.test(path); } else { // Get default path. - if (TorLauncherUtil.isWindows) + if (this._isUserDataOutsideOfAppDir) { + // This block is used for the TorBrowser-Data/ case. + if (TorLauncherUtil.isWindows) + { + if ("tor" == aTorFileType) + path = "TorBrowser\\Tor\\tor.exe"; + else if ("torrc-defaults" == aTorFileType) + path = "TorBrowser\\Tor\\torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor\\torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + } + else if (TorLauncherUtil.isMac) + { + if ("tor" == aTorFileType) + path = "Contents/Resources/TorBrowser/Tor/tor"; + else if ("torrc-defaults" == aTorFileType) + path = "Contents/Resources/TorBrowser/Tor/torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor/torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + } + else // Linux and others. + { + if ("tor" == aTorFileType) + path = "TorBrowser/Tor/tor"; + else if ("torrc-defaults" == aTorFileType) + path = "TorBrowser/Tor/torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor/torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + } + } + else if (TorLauncherUtil.isWindows) + { + // This block is used for the non-TorBrowser-Data/ case. if ("tor" == aTorFileType) path = "Tor\\tor.exe"; else if ("torrc-defaults" == aTorFileType) @@ -672,6 +723,7 @@ TorProcessService.prototype = } else // Linux, Mac OS and others. { + // This block is also used for the non-TorBrowser-Data/ case. if ("tor" == aTorFileType) path = "Tor/tor"; else if ("torrc-defaults" == aTorFileType) @@ -679,7 +731,7 @@ TorProcessService.prototype = else if ("torrc" == aTorFileType) path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) - path = "Data/Tor/"; + path = "Data/Tor"; } } @@ -688,51 +740,20 @@ TorProcessService.prototype = try { - var f; + let f; if (isRelativePath) { - // Turn into an absolute path. - if (!this.mTorFileBaseDir) + // Turn 'path' into an absolute path. + if (this._isUserDataOutsideOfAppDir) { - var topDir; - var appInfo = Cc["@mozilla.org/xre/app-info;1"] - .getService(Ci.nsIXULAppInfo); - if (appInfo.ID == this.kThunderbirdID || appInfo.ID == this.kInstantbirdID) - { - topDir = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); - topDir.append("extensions"); - topDir.append(this.kTorLauncherExtPath); - } - else - { - // For Firefox, paths are relative to the top of the TBB install. - var tbbBrowserDepth = 0; // Windows and Linux - if (TorLauncherUtil.isAppVersionAtLeast("21.0")) - { - // In FF21+, CurProcD is the "browser" directory that is next to - // the firefox binary, e.g., <TorFileBaseDir>/Browser/browser - ++tbbBrowserDepth; - } - if (TorLauncherUtil.isMac) - tbbBrowserDepth += 2; - - topDir = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); - while (tbbBrowserDepth > 0) - { - var didRemove = (topDir.leafName != "."); - topDir = topDir.parent; - if (didRemove) - tbbBrowserDepth--; - } - } - - topDir.append("TorBrowser"); - this.mTorFileBaseDir = topDir; + let baseDir = isUserData ? this._dataDir : this._appDir; + f = baseDir.clone(); + } + else + { + f = this._appDir.clone(); + f.append("TorBrowser"); } - - f = this.mTorFileBaseDir.clone(); f.appendRelativePath(path); } else @@ -741,6 +762,22 @@ TorProcessService.prototype = f.initWithPath(path); } + if (!f.exists() && aCreate) + { + try + { + if ("tordatadir" == aTorFileType) + f.create(f.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); + else + f.create(f.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE); + } + catch (e) + { + TorLauncherLogger.safelog(4, "unable to create " + f.path + ": ", e); + return null; + } + } + if (f.exists()) { try { f.normalize(); } catch(e) {} @@ -759,6 +796,83 @@ TorProcessService.prototype = return null; // File not found or error (logged above). }, // _getTorFile() + get _isUserDataOutsideOfAppDir() + { + if (this.mIsUserDataOutsideOfAppDir == undefined) + { + // Determine if we are using a "side-by-side" data model by checking + // for the existence of the TorBrowser-Data/ directory. + try + { + let f = this._appDir.parent; + f.append("TorBrowser-Data"); + this.mIsUserDataOutsideOfAppDir = f.exists() && f.isDirectory(); + } + catch (e) + { + this.mIsUserDataOutsideOfAppDir = false; + } + } + + return this.mIsUserDataOutsideOfAppDir; + }, // get _isUserDataOutsideOfAppDir + + // Returns an nsIFile that points to the application directory. + // May throw. + get _appDir() + { + if (!this.mAppDir) + { + let topDir = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); + let appInfo = Cc["@mozilla.org/xre/app-info;1"] + .getService(Ci.nsIXULAppInfo); + if ((appInfo.ID == this.kThunderbirdID) || + (appInfo.ID == this.kInstantbirdID)) + { + // For TorBirdy and Tor Messenger the Tor Launcher extension + // directory is returned. + topDir.append("extensions"); + topDir.append(this.kTorLauncherExtPath); + } + else // Tor Browser + { + // On Linux and Windows, we want to return the Browser/ directory. + // Because topDir ("CurProcD") points to Browser/browser on those + // platforms, we need to go up one level. + // On Mac OS, we want to return the TorBrowser.app/ directory. + // Because topDir points to Contents/Resources/browser on Mac OS, + // we need to go up 3 levels. + let tbbBrowserDepth = (TorLauncherUtil.isMac) ? 3 : 1; + while (tbbBrowserDepth > 0) + { + let didRemove = (topDir.leafName != "."); + topDir = topDir.parent; + if (didRemove) + tbbBrowserDepth--; + } + } + + this.mAppDir = topDir; + } + + return this.mAppDir; + }, // get _appDir + + // Returns an nsIFile that points to the TorBrowser-Data/ directory. + // May throw. + get _dataDir() + { + if (!this.mDataDir) + { + let f = this._appDir.parent.clone(); + f.append("TorBrowser-Data"); + this.mDataDir = f; + } + + return this.mDataDir; + }, // get _dataDir + _getpid: function() { // Use nsIXULRuntime.processID if it is available. diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index 34bf1a7..ac1af21 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -8,8 +8,15 @@ pref("extensions.torlauncher.control_port", 9151); pref("extensions.torlauncher.start_tor", true); pref("extensions.torlauncher.prompt_at_startup", true); -// All path prefs. are relative to the firefox executable's directory +// The tor_path is relative to the application directory. On Linux and +// Windows this is the Browser/ directory that contains the firefox +// executables, and on Mac OS it is the TorBrowser.app directory. pref("extensions.torlauncher.tor_path", ""); + +// The torrc_path and tordatadir_path are relative to the data directory, +// which is TorBrowser-Data/ if it exists as a sibling of the application +// directory. If TorBrowser-Data/ does not exist, these paths are relative +// to the TorBrowser/ directory within the application directory. pref("extensions.torlauncher.torrc_path", ""); pref("extensions.torlauncher.tordatadir_path", "");

1 0

[tor-launcher/maint-0.2.9] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 4442562704fc5df803cd0134209e5cacad29cb12 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Mar 25 10:08:15 2016 -0400 fixup! Bug 13252 - Do not store data in the app bundle Mac OS: account for the fact that user data is sometimes stored under ~/Library/Application Support/TorBrowser-Data. --- src/components/tl-process.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 7adb5a7..aba6456 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -801,12 +801,13 @@ TorProcessService.prototype = if (this.mIsUserDataOutsideOfAppDir == undefined) { // Determine if we are using a "side-by-side" data model by checking - // for the existence of the TorBrowser-Data/ directory. + // whether the user profile is outside of the app directory. try { - let f = this._appDir.parent; - f.append("TorBrowser-Data"); - this.mIsUserDataOutsideOfAppDir = f.exists() && f.isDirectory(); + let ds = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties); + let profDir = ds.get("ProfD", Ci.nsIFile); + this.mIsUserDataOutsideOfAppDir = !this._appDir.contains(profDir); } catch (e) { @@ -860,14 +861,16 @@ TorProcessService.prototype = }, // get _appDir // Returns an nsIFile that points to the TorBrowser-Data/ directory. + // This function is only used when this._isUserDataOutsideOfAppDir == true. // May throw. get _dataDir() { if (!this.mDataDir) { - let f = this._appDir.parent.clone(); - f.append("TorBrowser-Data"); - this.mDataDir = f; + let ds = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties); + let profDir = ds.get("ProfD", Ci.nsIFile); + this.mDataDir = profDir.parent.parent; } return this.mDataDir;

1 0

[tor-launcher/maint-0.2.9] Bug 10534: Let's not advertise help desk emails directly
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 8d94cc4e5de9bdce74fce3a7d5e1a438b435b7d2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 12 11:27:10 2016 -0400 Bug 10534: Let's not advertise help desk emails directly Do not display the help(a)rt.torproject.org email address (currently, no one is responding to help desk email). In the wizard and network settings window, point users to torproject.org/about/contact.html#support for assistance. --- src/chrome/content/network-settings-overlay.xul | 4 +++- src/chrome/content/network-settings.js | 8 +++++--- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index af9ddf9..10751d1 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -118,10 +118,12 @@ <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> <html:div>&torsettings.bridgeHelp3.emailList;</html:div> </html:li> + </html:ol> </vbox> <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f4ed746..2736f08 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -19,7 +19,9 @@ const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; -const kSupportAddr = "help(a)rt.torproject.org"; +// As of April 2016, no one is responding to help desk email. Hopefully this will change soon. +//const kSupportAddr = "help(a)rt.torproject.org"; +const kSupportURL = "torproject.org/about/contact.html#support"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; @@ -79,7 +81,7 @@ function initDialog() if (forAssistance) { forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( - "forAssistance", [kSupportAddr], 1); + "forAssistance2", [kSupportURL], 1); } var cancelBtn = document.documentElement.getButton("cancel"); diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 0ef4437..6b471a3 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0

[tor-launcher/master] Bug 10534: Let's not advertise help desk emails directly
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 3635ee8a79bc1ef6457250082d3937d7f1633911 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 12 11:27:10 2016 -0400 Bug 10534: Let's not advertise help desk emails directly Do not display the help(a)rt.torproject.org email address (currently, no one is responding to help desk email). In the wizard and network settings window, point users to torproject.org/about/contact.html#support for assistance. --- src/chrome/content/network-settings-overlay.xul | 4 +++- src/chrome/content/network-settings.js | 8 +++++--- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index af9ddf9..10751d1 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -118,10 +118,12 @@ <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> <html:div>&torsettings.bridgeHelp3.emailList;</html:div> </html:li> + </html:ol> </vbox> <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index d145f77..e0d7d1c 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -23,7 +23,9 @@ const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; -const kSupportAddr = "help(a)rt.torproject.org"; +// As of April 2016, no one is responding to help desk email. Hopefully this will change soon. +//const kSupportAddr = "help(a)rt.torproject.org"; +const kSupportURL = "torproject.org/about/contact.html#support"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; @@ -89,7 +91,7 @@ function initDialogCommon(aHasQuitButton) if (forAssistance) { forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( - "forAssistance", [kSupportAddr], 1); + "forAssistance2", [kSupportURL], 1); } if (aHasQuitButton) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 0ef4437..6b471a3 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0

[tor-launcher/maint-0.2.7] Bug 10534: Let's not advertise help desk emails directly
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 7c51ef35a36ede48dd00d2269d5a953ab150b217 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 12 11:27:10 2016 -0400 Bug 10534: Let's not advertise help desk emails directly Do not display the help(a)rt.torproject.org email address (currently, no one is responding to help desk email). In the wizard and network settings window, point users to torproject.org/about/contact.html#support for assistance. --- src/chrome/content/network-settings-overlay.xul | 4 +++- src/chrome/content/network-settings.js | 8 +++++--- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index af9ddf9..10751d1 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -118,10 +118,12 @@ <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> <html:div>&torsettings.bridgeHelp3.emailList;</html:div> </html:li> + </html:ol> </vbox> <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index e4ebeaa..561f0b4 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -19,7 +19,9 @@ const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; -const kSupportAddr = "help(a)rt.torproject.org"; +// As of April 2016, no one is responding to help desk email. Hopefully this will change soon. +//const kSupportAddr = "help(a)rt.torproject.org"; +const kSupportURL = "torproject.org/about/contact.html#support"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; @@ -76,7 +78,7 @@ function initDialog() if (forAssistance) { forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( - "forAssistance", [kSupportAddr], 1); + "forAssistance2", [kSupportURL], 1); } var cancelBtn = document.documentElement.getButton("cancel"); diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 07d3d09..9939cdb 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -54,7 +54,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 02be756..15d965c 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 20 Apr '16

20 Apr '16

commit 9f5d75791ac4fb8af6ac4ba0491df9f1b87be678 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 20 23:16:49 2016 +0000 Update translations for tails-onioncircuits --- fr/onioncircuits.pot | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/fr/onioncircuits.pot b/fr/onioncircuits.pot index 8892696..48f788e 100644 --- a/fr/onioncircuits.pot +++ b/fr/onioncircuits.pot @@ -4,13 +4,14 @@ # # Translators: # Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2016 +# Thomas Chauchefoin <thomas(a)chauchefoin.fr>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-30 08:14+0000\n" -"Last-Translator: Gwennole Hangard <gwennole.hangard(a)gmail.com>\n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-04-20 23:09+0000\n" +"Last-Translator: Thomas Chauchefoin <thomas(a)chauchefoin.fr>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: ../onioncircuits:81 msgid "" "Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "" +msgstr "Impossible de se connecter au daemon Tor. Onion Circuits va tenter de se reconnecter…" #: ../onioncircuits:94 msgid "Onion Circuits" @@ -29,7 +30,7 @@ msgstr "Circuits Onion" #: ../onioncircuits:95 msgid "Display Tor circuits and streams" -msgstr "" +msgstr "Afficher les circuits Tor et les flux" #: ../onioncircuits:107 msgid "OK" @@ -45,25 +46,25 @@ msgstr "État" #: ../onioncircuits:141 msgid "Click on a path to get details" -msgstr "" +msgstr "Cliquer sur un chemin pour avoir les détails" #: ../onioncircuits:215 msgid "" "Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "" +msgstr "La connexion vers le daemon Tor a été perdue. Onion Circuits va tenter de se reconnecter…" #: ../onioncircuits:232 msgid "Connected to the Tor daemon! You can use now Onion Circuits." -msgstr "" +msgstr "Connecté au daemon Tor ! Vous pouvez désormais utiliser Onion Circuits." #: ../onioncircuits:314 msgid "Building..." -msgstr "" +msgstr "Construction…" #: ../onioncircuits:339 #, c-format msgid "%s: %s" -msgstr "" +msgstr "%s : %s" #: ../onioncircuits:564 msgid "Fingerprint:"

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Apr '16

20 Apr '16

commit 08b28fedbf5eb3a57fb1f5a2e38a830366d5f78d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 20 11:12:20 2016 -0400 fixup! TB4: Tor Browser's Firefox preference overrides. Disable the WebGL failIfMajorPerformanceCaveat feature because it can be used as a fingerprinting vector (bug 18603). --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 15f7d14..4935bcd 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -101,6 +101,7 @@ pref("privacy.trackingprotection.pbmode.enabled", false); // Fingerprinting pref("webgl.min_capability_mode", true); pref("webgl.disable-extensions", true); +pref("webgl.disable-fail-if-major-performance-caveat", true); pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations pref("browser.display.max_font_attempts",10);

1 0

[tor/master] Remove trunnel files from libor/libcrypto, since they are in libtrunnel. Found with modularity tool.
by nickm＠torproject.org 20 Apr '16

20 Apr '16

commit 26db1b65b92270953a6fa9e79697773fe2b73235 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 20 13:39:07 2016 -0400 Remove trunnel files from libor/libcrypto, since they are in libtrunnel. Found with modularity tool. --- src/common/include.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 6215df7..f2e89a7 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -74,7 +74,6 @@ LIBOR_A_SOURCES = \ src/common/sandbox.c \ src/common/workqueue.c \ src/ext/csiphash.c \ - src/ext/trunnel/trunnel.c \ $(libor_extra_source) \ $(threads_impl_source) \ $(readpassphrase_source) @@ -90,7 +89,6 @@ LIBOR_CRYPTO_A_SOURCES = \ src/common/crypto_format.c \ src/common/torgzip.c \ src/common/tortls.c \ - src/trunnel/pwbox.c \ src/common/crypto_curve25519.c \ src/common/crypto_ed25519.c

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Apr '16

20 Apr '16

commit 5d9a6f8007e36a0276f3333fd5bcad2ffe69a2f7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 20 09:35:56 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Disabling additional startup URLs (bug 18848) --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 3b859bc..15f7d14 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -8,6 +8,9 @@ pref("browser.search.update", false); pref("browser.rights.3.shown", true); pref("startup.homepage_welcome_url", ""); +pref("startup.homepage_welcome_url.additional", ""); +// Not set Windows 10 users would get a special introduction on first start. +pref("browser.usedOnWindows10", true); // Set a generic, default URL that will be opened in a tab after an update. // Typically, this will not be used; instead, the <update> element within

1 0