March 2015 - tor-commits - lists.torproject.org

[torbutton/master] Bug 14631: Improve profile access error msgs (strings).
by mikeperry＠torproject.org 18 Mar '15

18 Mar '15

commit fd2be43f999da3babdc0276ae2d2769938fe56c8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Feb 27 10:40:47 2015 -0500 Bug 14631: Improve profile access error msgs (strings). To allow for localization, get profile-related error strings from Torbutton. --- src/chrome/locale/en/torbutton.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 505f31b..50985a4 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -61,3 +61,10 @@ canvas.allow=Allow in the future canvas.allowAccessKey=A canvas.never=Never for this site (recommended) canvas.neverAccessKey=e + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=%S Profile Problem +profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. +profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. +profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again.

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug14631-01'
by mikeperry＠torproject.org 18 Mar '15

18 Mar '15

commit dc2fae0f80f156a2f0d80004b3a631687e4c7128 Merge: 4394ffb fd2be43 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 17 21:01:02 2015 -0700 Merge remote-tracking branch 'brade/bug14631-01' src/chrome/locale/en/torbutton.properties | 7 +++++++ 1 file changed, 7 insertions(+)

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 14631: Improve profile access error messages.
by mikeperry＠torproject.org 18 Mar '15

18 Mar '15

commit bebc69b8e8e919abec272f9cff6ab13fb9ea51f7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Feb 24 13:50:23 2015 -0500 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". --- .../mozapps/profile/profileSelection.properties | 5 + toolkit/xre/nsAppRunner.cpp | 112 +++++++++++++++++--- 2 files changed, 103 insertions(+), 14 deletions(-) diff --git a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties index adac95a..3cf48ff 100644 --- a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties +++ b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties @@ -12,6 +12,11 @@ restartMessageUnlocker=%S is already running, but is not responding. The old %S restartMessageNoUnlockerMac=A copy of %S is already open. Only one copy of %S can be open at a time. restartMessageUnlockerMac=A copy of %S is already open. The running copy of %S will quit in order to open this one. +# LOCALIZATION NOTE (profileProblemTitle, profileReadOnly, profileReadOnlyMac, profileAccessDenied): Messages displayed when the browser profile cannot be accessed or written to. %S is the application name. +profileProblemTitle=%S Profile Problem +profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. +profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. +profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. # Profile manager # LOCALIZATION NOTE (profileTooltip): First %S is the profile name, second %S is the path to the profile folder. profileTooltip=Profile: '%S' - Path: '%S' diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index cadc46d..dbd1376 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -1682,12 +1682,20 @@ static nsresult LaunchChild(nsINativeAppSupport* aNative, return NS_ERROR_LAUNCHED_CHILD_PROCESS; } +enum ProfileStatus { + PROFILE_STATUS_OK, + PROFILE_STATUS_ACCESS_DENIED, + PROFILE_STATUS_READ_ONLY, + PROFILE_STATUS_IS_LOCKED, + PROFILE_STATUS_OTHER_ERROR +}; + static const char kProfileProperties[] = "chrome://mozapps/locale/profile/profileSelection.properties"; static nsresult -ProfileLockedDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, - nsIProfileUnlocker* aUnlocker, +ProfileErrorDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, + ProfileStatus aStatus, nsIProfileUnlocker* aUnlocker, nsINativeAppSupport* aNative, nsIProfileLock* *aResult) { nsresult rv; @@ -1717,17 +1725,29 @@ ProfileLockedDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, #ifndef XP_MACOSX static const char16_t kRestartNoUnlocker[] = {'r','e','s','t','a','r','t','M','e','s','s','a','g','e','N','o','U','n','l','o','c','k','e','r','\0'}; // "restartMessageNoUnlocker" static const char16_t kRestartUnlocker[] = {'r','e','s','t','a','r','t','M','e','s','s','a','g','e','U','n','l','o','c','k','e','r','\0'}; // "restartMessageUnlocker" + static const char16_t kReadOnly[] = {'p','r','o','f','i','l','e','R','e','a','d','O','n','l','y','\0'}; // "profileReadOnly" #else static const char16_t kRestartNoUnlocker[] = {'r','e','s','t','a','r','t','M','e','s','s','a','g','e','N','o','U','n','l','o','c','k','e','r','M','a','c','\0'}; // "restartMessageNoUnlockerMac" static const char16_t kRestartUnlocker[] = {'r','e','s','t','a','r','t','M','e','s','s','a','g','e','U','n','l','o','c','k','e','r','M','a','c','\0'}; // "restartMessageUnlockerMac" + static const char16_t kReadOnly[] = {'p','r','o','f','i','l','e','R','e','a','d','O','n','l','y','M','a','c','\0'}; // "profileReadOnlyMac" #endif - sb->FormatStringFromName(aUnlocker ? kRestartUnlocker : kRestartNoUnlocker, - params, 2, getter_Copies(killMessage)); + static const char16_t kAccessDenied[] = {'p','r','o','f','i','l','e','A','c','c','e','s','s','D','e','n','i','e','d','\0'}; // "profileAccessDenied" + const char16_t *errorKey = aUnlocker ? kRestartUnlocker + : kRestartNoUnlocker; + if (PROFILE_STATUS_READ_ONLY == aStatus) + errorKey = kReadOnly; + else if (PROFILE_STATUS_ACCESS_DENIED == aStatus) + errorKey = kAccessDenied; + sb->FormatStringFromName(errorKey, params, 2, getter_Copies(killMessage)); + + const char16_t *titleKey = ((PROFILE_STATUS_READ_ONLY == aStatus) || + (PROFILE_STATUS_ACCESS_DENIED == aStatus)) + ? MOZ_UTF16("profileProblemTitle") + : MOZ_UTF16("restartTitle"); nsXPIDLString killTitle; - sb->FormatStringFromName(MOZ_UTF16("restartTitle"), - params, 1, getter_Copies(killTitle)); + sb->FormatStringFromName(titleKey, params, 1, getter_Copies(killTitle)); if (!killMessage || !killTitle) return NS_ERROR_FAILURE; @@ -1828,8 +1848,9 @@ ProfileMissingDialog(nsINativeAppSupport* aNative) } static nsresult -ProfileLockedDialog(nsIToolkitProfile* aProfile, nsIProfileUnlocker* aUnlocker, - nsINativeAppSupport* aNative, nsIProfileLock* *aResult) +ProfileErrorDialog(nsIToolkitProfile* aProfile, ProfileStatus aStatus, + nsIProfileUnlocker* aUnlocker, nsINativeAppSupport* aNative, + nsIProfileLock* *aResult) { nsCOMPtr<nsIFile> profileDir; nsresult rv = aProfile->GetRootDir(getter_AddRefs(profileDir)); @@ -1845,8 +1866,8 @@ ProfileLockedDialog(nsIToolkitProfile* aProfile, nsIProfileUnlocker* aUnlocker, rv = aProfile->GetLocalDir(getter_AddRefs(profileLocalDir)); if (NS_FAILED(rv)) return rv; - return ProfileLockedDialog(profileDir, profileLocalDir, aUnlocker, aNative, - aResult); + return ProfileErrorDialog(profileDir, profileLocalDir, aStatus, aUnlocker, + aNative, aResult); } static const char kProfileManagerURL[] = @@ -2007,6 +2028,53 @@ SetCurrentProfileAsDefault(nsIToolkitProfileService* aProfileSvc, return rv; } +// Check for write permission to the profile directory by trying to create a +// new file (after ensuring that no file with the same name exists). +static ProfileStatus CheckProfileWriteAccess(nsIFile* aProfileDir) +{ +#if defined(XP_UNIX) + NS_NAMED_LITERAL_STRING(writeTestFileName, ".parentwritetest"); +#else + NS_NAMED_LITERAL_STRING(writeTestFileName, "parent.writetest"); +#endif + + nsCOMPtr<nsIFile> writeTestFile; + nsresult rv = aProfileDir->Clone(getter_AddRefs(writeTestFile)); + if (NS_SUCCEEDED(rv)) + rv = writeTestFile->Append(writeTestFileName); + + if (NS_SUCCEEDED(rv)) { + bool doesExist = false; + rv = writeTestFile->Exists(&doesExist); + if (NS_SUCCEEDED(rv) && doesExist) + rv = writeTestFile->Remove(true); + } + + if (NS_SUCCEEDED(rv)) { + rv = writeTestFile->Create(nsIFile::NORMAL_FILE_TYPE, 0666); + (void)writeTestFile->Remove(true); + } + + ProfileStatus status = NS_SUCCEEDED(rv) ? PROFILE_STATUS_OK + : PROFILE_STATUS_OTHER_ERROR; + if (NS_ERROR_FILE_ACCESS_DENIED == rv) + status = PROFILE_STATUS_ACCESS_DENIED; + else if (NS_ERROR_FILE_READ_ONLY == rv) + status = PROFILE_STATUS_READ_ONLY; + + return status; +} + +static ProfileStatus CheckProfileWriteAccess(nsIToolkitProfile* aProfile) +{ + nsCOMPtr<nsIFile> profileDir; + nsresult rv = aProfile->GetRootDir(getter_AddRefs(profileDir)); + if (NS_FAILED(rv)) + return PROFILE_STATUS_OTHER_ERROR; + + return CheckProfileWriteAccess(profileDir); +} + static bool gDoMigration = false; static bool gDoProfileReset = false; @@ -2140,13 +2208,18 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n NS_ENSURE_SUCCESS(rv, rv); } + ProfileStatus status = CheckProfileWriteAccess(lf); + if (PROFILE_STATUS_OK != status) + return ProfileErrorDialog(lf, lf, status, nullptr, aNative, aResult); + // If a profile path is specified directory on the command line, then // assume that the temp directory is the same as the given directory. rv = NS_LockProfilePath(lf, lf, getter_AddRefs(unlocker), aResult); if (NS_SUCCEEDED(rv)) return rv; - return ProfileLockedDialog(lf, lf, unlocker, aNative, aResult); + return ProfileErrorDialog(lf, lf, PROFILE_STATUS_IS_LOCKED, unlocker, + aNative, aResult); } ar = CheckArg("createprofile", true, &arg); @@ -2231,6 +2304,10 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n gDoProfileReset = false; } + ProfileStatus status = CheckProfileWriteAccess(profile); + if (PROFILE_STATUS_OK != status) + return ProfileErrorDialog(profile, status, nullptr, aNative, aResult); + nsCOMPtr<nsIProfileUnlocker> unlocker; rv = profile->Lock(getter_AddRefs(unlocker), aResult); if (NS_SUCCEEDED(rv)) { @@ -2239,7 +2316,8 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n return NS_OK; } - return ProfileLockedDialog(profile, unlocker, aNative, aResult); + return ProfileErrorDialog(profile, PROFILE_STATUS_IS_LOCKED, unlocker, + aNative, aResult); } if (CanShowProfileManager()) { @@ -2293,7 +2371,8 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n nsCOMPtr<nsIProfileUnlocker> unlocker; rv = profile->Lock(getter_AddRefs(unlocker), &tempProfileLock); if (NS_FAILED(rv)) - return ProfileLockedDialog(profile, unlocker, aNative, &tempProfileLock); + return ProfileErrorDialog(profile, PROFILE_STATUS_IS_LOCKED, + unlocker, aNative, &tempProfileLock); } nsCOMPtr<nsIToolkitProfile> newProfile; @@ -2304,6 +2383,10 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n gDoProfileReset = false; } + ProfileStatus status = CheckProfileWriteAccess(profile); + if (PROFILE_STATUS_OK != status) + return ProfileErrorDialog(profile, status, nullptr, aNative, aResult); + // If you close Firefox and very quickly reopen it, the old Firefox may // still be closing down. Rather than immediately showing the // "Firefox is running but is not responding" message, we spend a few @@ -2329,7 +2412,8 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n PR_Sleep(kLockRetrySleepMS); } while (TimeStamp::Now() - start < TimeDuration::FromSeconds(kLockRetrySeconds)); - return ProfileLockedDialog(profile, unlocker, aNative, aResult); + return ProfileErrorDialog(profile, PROFILE_STATUS_IS_LOCKED, unlocker, + aNative, aResult); } }

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 14631: Improve profile access error msgs (strings).
by mikeperry＠torproject.org 18 Mar '15

18 Mar '15

commit ce2343957e7617ffa47c5b2b8b2a3128916ac92e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Feb 27 10:38:40 2015 -0500 Bug 14631: Improve profile access error msgs (strings). To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. --- toolkit/xre/moz.build | 4 +- toolkit/xre/nsAppRunner.cpp | 116 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 111 insertions(+), 9 deletions(-) diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index a13a9ef..a1a875b 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -109,8 +109,8 @@ FINAL_LIBRARY = 'xul' if CONFIG['MOZ_GL_DEFAULT_PROVIDER'] == 'GLX': DEFINES['USE_GLX_TEST'] = True -for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_VERSION', 'OS_TARGET', - 'MOZ_WIDGET_TOOLKIT'): +for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_DISPLAYNAME', + 'MOZ_APP_VERSION', 'OS_TARGET', 'MOZ_WIDGET_TOOLKIT'): DEFINES[var] = '"%s"' % CONFIG[var] if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index dbd1376..dc7d424 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -1682,6 +1682,104 @@ static nsresult LaunchChild(nsINativeAppSupport* aNative, return NS_ERROR_LAUNCHED_CHILD_PROCESS; } +static nsresult +GetOverrideStringBundleForLocale(nsIStringBundleService* aSBS, + const char* aTorbuttonURI, const char* aLocale, + nsIStringBundle* *aResult) +{ + NS_ENSURE_ARG(aSBS); + NS_ENSURE_ARG(aTorbuttonURI); + NS_ENSURE_ARG(aLocale); + NS_ENSURE_ARG(aResult); + + const char* kFormatStr = "jar:%s!/chrome/locale/%s/torbutton.properties"; + nsPrintfCString strBundleURL(kFormatStr, aTorbuttonURI, aLocale); + nsresult rv = aSBS->CreateBundle(strBundleURL.get(), aResult); + NS_ENSURE_SUCCESS(rv, rv); + + // To ensure that we have a valid string bundle, try to retrieve a string + // that we know exists. + nsXPIDLString val; + rv = (*aResult)->GetStringFromName(MOZ_UTF16("profileProblemTitle"), + getter_Copies(val)); + if (!NS_SUCCEEDED(rv)) + *aResult = nullptr; // No good. Discard it. + + return rv; +} + +static void +GetOverrideStringBundle(nsIStringBundleService* aSBS, nsIStringBundle* *aResult) +{ + if (!aSBS || !aResult) + return; + + *aResult = nullptr; + + // Build Torbutton file URI string by starting from the profiles directory. + nsXREDirProvider* dirProvider = nsXREDirProvider::GetSingleton(); + if (!dirProvider) + return; + + bool persistent = false; // ignored + nsCOMPtr<nsIFile> profilesDir; + nsresult rv = dirProvider->GetFile(NS_APP_USER_PROFILES_ROOT_DIR, &persistent, + getter_AddRefs(profilesDir)); + if (NS_FAILED(rv)) + return; + + // Create file URI, extract as string, and append Torbutton xpi relative path. + nsCOMPtr<nsIURI> uri; + nsAutoCString uriString; + if (NS_FAILED(NS_NewFileURI(getter_AddRefs(uri), profilesDir)) || + NS_FAILED(uri->GetSpec(uriString))) { + return; + } + + uriString.Append("profile.default/extensions/torbutton(a)torproject.org.xpi"); + + nsCString userAgentLocale; + if (!NS_SUCCEEDED(Preferences::GetCString("general.useragent.locale", + &userAgentLocale))) { + return; + } + + rv = GetOverrideStringBundleForLocale(aSBS, uriString.get(), + userAgentLocale.get(), aResult); + if (NS_FAILED(rv)) { + // Try again using base locale, e.g., "en" vs. "en-US". + int16_t offset = userAgentLocale.FindChar('-', 1); + if (offset > 0) { + nsAutoCString shortLocale(Substring(userAgentLocale, 0, offset)); + rv = GetOverrideStringBundleForLocale(aSBS, uriString.get(), + shortLocale.get(), aResult); + } + } +} + +static nsresult +GetFormattedString(nsIStringBundle* aOverrideBundle, + nsIStringBundle* aMainBundle, + const char16_t* aName, + const char16_t** aParams, uint32_t aLength, + char16_t* *aResult) +{ + NS_ENSURE_ARG(aName); + NS_ENSURE_ARG(aResult); + + nsresult rv = NS_ERROR_FAILURE; + if (aOverrideBundle) { + rv = aOverrideBundle->FormatStringFromName(aName, aParams, aLength, + aResult); + } + + // If string was not found in override bundle, use main (browser) bundle. + if (NS_FAILED(rv) && aMainBundle) + rv = aMainBundle->FormatStringFromName(aName, aParams, aLength, aResult); + + return rv; +} + enum ProfileStatus { PROFILE_STATUS_OK, PROFILE_STATUS_ACCESS_DENIED, @@ -1718,7 +1816,10 @@ ProfileErrorDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, sbs->CreateBundle(kProfileProperties, getter_AddRefs(sb)); NS_ENSURE_TRUE_LOG(sbs, NS_ERROR_FAILURE); - NS_ConvertUTF8toUTF16 appName(gAppData->name); + nsCOMPtr<nsIStringBundle> overrideSB; + GetOverrideStringBundle(sbs, getter_AddRefs(overrideSB)); + + NS_ConvertUTF8toUTF16 appName(MOZ_APP_DISPLAYNAME); const char16_t* params[] = {appName.get(), appName.get()}; nsXPIDLString killMessage; @@ -1734,21 +1835,22 @@ ProfileErrorDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, static const char16_t kAccessDenied[] = {'p','r','o','f','i','l','e','A','c','c','e','s','s','D','e','n','i','e','d','\0'}; // "profileAccessDenied" - const char16_t *errorKey = aUnlocker ? kRestartUnlocker + const char16_t* errorKey = aUnlocker ? kRestartUnlocker : kRestartNoUnlocker; if (PROFILE_STATUS_READ_ONLY == aStatus) errorKey = kReadOnly; else if (PROFILE_STATUS_ACCESS_DENIED == aStatus) errorKey = kAccessDenied; - sb->FormatStringFromName(errorKey, params, 2, getter_Copies(killMessage)); + GetFormattedString(overrideSB, sb, errorKey, params, 2, + getter_Copies(killMessage)); - const char16_t *titleKey = ((PROFILE_STATUS_READ_ONLY == aStatus) || + const char16_t* titleKey = ((PROFILE_STATUS_READ_ONLY == aStatus) || (PROFILE_STATUS_ACCESS_DENIED == aStatus)) ? MOZ_UTF16("profileProblemTitle") : MOZ_UTF16("restartTitle"); nsXPIDLString killTitle; - sb->FormatStringFromName(titleKey, params, 1, getter_Copies(killTitle)); - + GetFormattedString(overrideSB, sb, titleKey, params, 1, + getter_Copies(killTitle)); if (!killMessage || !killTitle) return NS_ERROR_FAILURE; @@ -1822,7 +1924,7 @@ ProfileMissingDialog(nsINativeAppSupport* aNative) sbs->CreateBundle(kProfileProperties, getter_AddRefs(sb)); NS_ENSURE_TRUE_LOG(sbs, NS_ERROR_FAILURE); - NS_ConvertUTF8toUTF16 appName(gAppData->name); + NS_ConvertUTF8toUTF16 appName(MOZ_APP_DISPLAYNAME); const char16_t* params[] = {appName.get(), appName.get()}; nsXPIDLString missingMessage;

1 0

[torbutton/master] Bug 15334: Display Cookie Protections menu choice if disk records enabled.
by mikeperry＠torproject.org 18 Mar '15

18 Mar '15

commit 4394ffb289e78fbec0c772481570b55776e0d0dc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 17 19:36:40 2015 -0700 Bug 15334: Display Cookie Protections menu choice if disk records enabled. Regression caused during #14632. --- src/chrome/content/torbutton.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index a14a097..09d6080 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2107,10 +2107,6 @@ function torbutton_update_disk_prefs() { m_tb_prefs.setIntPref("browser.download.manager.retention", 2); } - // XXX: Bug 14632: The cookie dialog is useless in private browsing mode in FF31ESR - // See https://trac.torproject.org/projects/tor/ticket/10353 for more info. - document.getElementById("torbutton-cookie-protector").hidden = mode; - // Force prefs to be synced to disk var prefService = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefService); @@ -2606,6 +2602,10 @@ function torbutton_check_protections() var cookie_pref = m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections"); document.getElementById("torbutton-cookie-protector").disabled = !cookie_pref; + // XXX: Bug 14632: The cookie dialog is useless in private browsing mode in FF31ESR + // See https://trac.torproject.org/projects/tor/ticket/10353 for more info. + document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("extensions.torbutton.block_disk"); + if (!m_tb_control_pass || !m_tb_control_port) document.getElementById("torbutton-new-identity").disabled = true;

1 0

[bridgedb/develop] Update stem==1.2.2 → stem==1.3.0 in .travis.requirements.txt.
by isis＠torproject.org 18 Mar '15

18 Mar '15

commit 9f9e5a86d310640f54b7bd9150d3ae7e0ba04a09 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 00:09:08 2015 +0000 Update stem==1.2.2 → stem==1.3.0 in .travis.requirements.txt. --- .travis.requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 28cfd78..0651712 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -26,5 +26,5 @@ pycrypto==2.6.1 pygeoip==0.2.7 gnupg==2.0.1 recaptcha-client==1.0.6 -stem==1.2.2 +stem==1.3.0 zope.interface==3.6.1

1 0

[bridgedb/develop] Update gnupg==2.0.0 → gnupg==2.0.1 in requirements.txt.
by isis＠torproject.org 18 Mar '15

18 Mar '15

commit 71a6ad2de1a07e3ced70dde9bdb6b44250010d9a Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 00:07:27 2015 +0000 Update gnupg==2.0.0 → gnupg==2.0.1 in requirements.txt. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 27c531c..922b3d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 pyOpenSSL==0.14 pygeoip==0.2.7 -gnupg==2.0.0 +gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 recaptcha-client==1.0.6

1 0

[bridgedb/develop] Add stem==1.3.0 to requirements.txt.
by isis＠torproject.org 18 Mar '15

18 Mar '15

commit 9635ec7dfcbb4a8f3a95469af709172306cf0b74 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 00:09:55 2015 +0000 Add stem==1.3.0 to requirements.txt. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 922b3d9..6eeee59 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,4 +10,5 @@ gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 recaptcha-client==1.0.6 +stem==1.3.0 zope.interface==3.6.1

1 0

[bridgedb/develop] Update gnupg==2.0.0 → gnupg==2.0.1 in .travis.requirements.txt.
by isis＠torproject.org 18 Mar '15

18 Mar '15

commit cda80b3484f60ed4eb08bc9c801c4ed63c98d0f3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 00:06:18 2015 +0000 Update gnupg==2.0.0 → gnupg==2.0.1 in .travis.requirements.txt. --- .travis.requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index d2a94a8..28cfd78 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -24,7 +24,7 @@ Mako==0.8.1 https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 pygeoip==0.2.7 -gnupg==2.0.0 +gnupg==2.0.1 recaptcha-client==1.0.6 stem==1.2.2 zope.interface==3.6.1

1 0

[bridgedb/develop] Merge branch 'hotfix/0.2.4-14797-requirements' into develop
by isis＠torproject.org 18 Mar '15

18 Mar '15

commit a8451767b1327118122ba68a803520fbf5e71927 Merge: 7de653e 9635ec7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 00:20:50 2015 +0000 Merge branch 'hotfix/0.2.4-14797-requirements' into develop .travis.requirements.txt | 4 ++-- requirements.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0