- tbb-commits - lists.torproject.org

[torbutton/master] Bug 20753: Remove obsolete StartPage L10n strings
by gk＠torproject.org 25 Nov '16

25 Nov '16

commit 88cf6251a1ca3c02361673f9a5d542290382c998 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 23 14:51:37 2016 -0800 Bug 20753: Remove obsolete StartPage L10n strings Translators were asking whether they should be localizing the StartPage privacy policy link. As we aren't using these strings anyhow, it seems better to remove them so we don't waste translators' time. --- src/chrome/locale/en/aboutTor.dtd | 1 - src/chrome/locale/en/aboutTor.properties | 6 ------ 2 files changed, 7 deletions(-) diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 9e44fc2..7f89286 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -20,7 +20,6 @@ <!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index 76192f4..811073e 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html

1 0

[tor-browser/tor-browser-45.5.0esr-6.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 24 Nov '16

24 Nov '16

commit 76d74d18040e22fdb6b100b4638078c2e83fa195 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 14 10:46:45 2016 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. --- 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 1f1db9e..a5b6aa9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -147,6 +147,7 @@ pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org // bug 18950 for more details. pref("browser.reader.detectedFirstArticle", true); pref("reader.parse-on-load.enabled", false); +pref("privacy.use_utc_timezone", true); // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser/tor-browser-45.5.0esr-6.5-1] Bug 16622: Pref to spoof time zone as UTC
by gk＠torproject.org 24 Nov '16

24 Nov '16

commit d973b7ebaa5e93ee8e4b6b9f07ec51333687087b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 14 10:22:09 2016 -0800 Bug 16622: Pref to spoof time zone as UTC --- toolkit/xre/nsAppRunner.cpp | 9 +++++++++ toolkit/xre/nsAppRunner.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index f0cdd41..81f949a 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -4680,6 +4680,8 @@ XREMain::XRE_mainRun() OverrideDefaultLocaleIfNeeded(); + UseUTCTimeZoneIfNeeded(); + #ifdef MOZ_CRASHREPORTER nsCString userAgentLocale; // Try a localized string first. This pref is always a localized string in @@ -5385,3 +5387,10 @@ OverrideDefaultLocaleIfNeeded() { setlocale(LC_ALL, "C.UTF-8") || setlocale(LC_ALL, "C"); } } + +void +UseUTCTimeZoneIfNeeded() { + if (mozilla::Preferences::GetBool("privacy.use_utc_timezone", false)) { + SaveToEnv("TZ=UTC"); + } +} diff --git a/toolkit/xre/nsAppRunner.h b/toolkit/xre/nsAppRunner.h index c7048e0..cab42a4 100644 --- a/toolkit/xre/nsAppRunner.h +++ b/toolkit/xre/nsAppRunner.h @@ -96,6 +96,9 @@ WriteConsoleLog(); void OverrideDefaultLocaleIfNeeded(); +void +UseUTCTimeZoneIfNeeded(); + #ifdef XP_WIN void UseParentConsole();

1 0

[torbutton/master] Bug 16622: Timezone spoofing moved to tor-browser.git
by gk＠torproject.org 24 Nov '16

24 Nov '16

commit 86dd5f30f7b6b29d6eb7e1947c225cd3cc43021b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 14 10:49:20 2016 -0800 Bug 16622: Timezone spoofing moved to tor-browser.git --- src/chrome/content/torbutton.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 139cb41..c0fe710 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -891,17 +891,6 @@ function torbutton_update_toolbutton() torbutton_get_property_string(tooltipKey)); } -// Bug 1506 P4: Timezone spoofing is pretty important -function torbutton_set_timezone() { - /* Windows doesn't call tzset() automatically.. Linux and MacOS - * both do though.. FF3.5 now calls _tzset() for us on windows. - */ - torbutton_log(3, "Setting timezone to UTC"); - var environ = Components.classes["@mozilla.org/process/environment;1"] - .getService(Components.interfaces.nsIEnvironment); - environ.set("TZ", "UTC"); -} - // Bug 1506 P3: Support code for language+uagent spoofing function torbutton_get_general_useragent_locale() { try { @@ -1747,8 +1736,6 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode); - // XXX: How do we undo timezone? - // Force prefs to be synced to disk m_tb_prefs.savePrefFile(null); } @@ -2026,9 +2013,6 @@ function torbutton_do_startup() // Bug 1506: Should probably be moved to an XPCOM component torbutton_do_main_window_startup(); - // Bug 1506: Still want to do this - torbutton_set_timezone(); - // For charsets torbutton_update_fingerprinting_prefs();

1 0

[tor-browser/tor-browser-45.5.0esr-6.5-1] Bug 20707: Avoid localization failure in about:preferences
by gk＠torproject.org 22 Nov '16

22 Nov '16

commit 70b2e4769bc4a7dd877e8ca82403d71561dbeec8 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 18 12:42:22 2016 -0800 Bug 20707: Avoid localization failure in about:preferences This fixes problem with our 20244 patches in non-US-English locales. If those patches are uplifted, then Mozilla can localize the strings. In the meantime, this patch removes our localizable strings from privacy.xul altogether. Our torbutton code overlays localized strings anyway. (This patch should not be uplifted.) --- browser/components/preferences/in-content/privacy.xul | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul index d180ee2..0487db7 100644 --- a/browser/components/preferences/in-content/privacy.xul +++ b/browser/components/preferences/in-content/privacy.xul @@ -137,8 +137,8 @@ <hbox align="center"> <checkbox id="thirdpartyIsolateCB" preference="privacy.thirdparty.isolate" - accesskey="&thirdpartyIsolate.accesskey;" - label="&thirdpartyIsolate.label;" + accesskey="R" + label="Restrict third party cookies and other tracking data" onsyncfrompreference="return gPrivacyPane.readThirdPartyIsolate();" onsynctopreference="return gPrivacyPane.writeThirdPartyIsolate();"/> </hbox> @@ -147,8 +147,8 @@ <hbox align="center"> <checkbox id="resistFingerprintingCB" preference="privacy.resistFingerprinting" - accesskey="&resistFingerprinting.accesskey;" - label="&resistFingerprinting.label;" /> + accesskey="F" + label="Change details that distinguish you from other Tor Browser users" /> </hbox> </vbox> </groupbox>

1 0

[torbutton/master] Bug 20614: Add links to Tor Browser User Manual
by gk＠torproject.org 22 Nov '16

22 Nov '16

commit 24e2f3aa02b40274e20e27aa568c076bd74f7b2f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 11 20:03:15 2016 -0800 Bug 20614: Add links to Tor Browser User Manual --- src/chrome/content/aboutTor/aboutTor.xhtml | 13 ++++++++++++- src/chrome/content/menu-overlay.xul | 11 ++++++++++- src/chrome/content/torbutton.js | 31 +++++++++++++++++++++++++++++- src/chrome/locale/en/aboutTor.dtd | 2 ++ src/chrome/locale/en/torbutton.dtd | 2 ++ src/chrome/skin/aboutTor.css | 9 ++++----- 6 files changed, 60 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 2fffb2a..2c823b5 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -241,7 +241,18 @@ window.addEventListener("pageshow", function() { <div class="bubble"> <h1>&aboutTor.whatnextQuestion.label;</h1> <p>&aboutTor.whatnextAnswer.label;</p> - <a class="tips" href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a> + <ul> + <li> + <a href="&aboutTor.whatnext.link;"> + &aboutTor.whatnext.label; + </a> + </li> + <li class="showForManual"> + <a href="&aboutTor.torbrowser_user_manual.link;"> + &aboutTor.torbrowser_user_manual.label; + </a> + </li> + </ul> </div> <div class="bubble"> diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index ceadf85..8067b5c 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>  - +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + <overlay id="torbutton-menu-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <menupopup id="menu_HelpPopup"> +  <menuitem id="menu_openHelp" removeelement="true"/> <menuitem id="menu_openTour" removeelement="true"/> <menuitem id="healthReport" removeelement="true"/> @@ -14,5 +16,12 @@  <box id="menu_HelpPopup_reportPhishingtoolmenu"/> <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> +  + <menuitem name="torBrowserUserManual" + id="torBrowserUserManual" + position="1" + label="&torbutton.torbrowser_user_manual.label;" + accesskey="&torbutton.torbrowser_user_manual.accesskey;" + oncommand="torbutton_open_torbrowser_user_manual()" /> </menupopup> </overlay> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7de599d..139cb41 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,6 +12,7 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); +let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -362,7 +363,7 @@ function torbutton_init() { window.addEventListener("aftercustomization", function() { torbutton_update_all_abouttor_pages(undefined, undefined); }, false); - + //setting up context menu //var contextMenu = document.getElementById("contentAreaContextMenu"); //if (contextMenu) @@ -399,6 +400,8 @@ function torbutton_init() { quantizeBrowserSize(window, 100, 100); + torbutton_init_user_manual_links(); + torbutton_log(3, 'init completed'); } @@ -630,6 +633,11 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { else aDoc.body.removeAttribute("torNeedsUpdate"); + if (torbutton_show_torbrowser_manual()) + aDoc.body.setAttribute("showmanual", "yes"); + else + aDoc.body.removeAttribute("showmanual"); + // Display product name and TBB version. try { const kBrandBundle = "chrome://branding/locale/brand.properties"; @@ -2437,5 +2445,26 @@ function torbutton_update_noscript_button() }, 0); } +// Opens the Tor Browser User Manual in a new tab +function torbutton_open_torbrowser_user_manual() { + gBrowser.selectedTab = gBrowser.addTab("https://tb-manual.torproject.org"); +} + +// Returns true if we should show the tor browser manual. +function torbutton_show_torbrowser_manual() { + let locale = torbutton_get_general_useragent_locale(); + return locale.startsWith("en"); +} + +// Makes sure the item in the Help Menu and the link in about:tor +// for the Tor Browser User Manual are only visible when +// torbutton_show_torbrowser_manual() returns true. +function torbutton_init_user_manual_links() { + let menuitem = document.getElementById("torBrowserUserManual"); + bindPrefAndInit("general.useragent.locale", val => { + menuitem.hidden = !torbutton_show_torbrowser_manual(); + torbutton_update_all_abouttor_pages(undefined, undefined); + }); +} //vim:set ts=4 diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 12313c4..9e44fc2 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -32,6 +32,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> <!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "You Can Help!"> <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> <!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 97a994f..c67ec6e 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 0a196dc..3f747a9 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -132,6 +132,10 @@ body[toron] .top h1 { color: #600060; } +body:not([showmanual]) .showForManual { + display: none; +} + div.hideIfTorIsUpToDate, body .top div.hideIfTorIsUpToDate h1 { color: black; @@ -201,11 +205,6 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { margin-bottom: 10px; } -#middle a.tips { - display: block; - margin-top: 1.6em; -} - #middle ul { padding: 5px 0 0 22px; }

1 0

[torbutton/master] Revert "Bug 20614: Add links to Tor Browser User Manual"
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 745c80d997df1f2f5b2351f55cc8fc263228f73b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 21 18:56:21 2016 +0000 Revert "Bug 20614: Add links to Tor Browser User Manual" This reverts commit 8a5dc8c510331714e84feb2b8d4369abf76b8e20. This is the wrong commit for 20614. --- src/chrome/content/aboutTor/aboutTor.xhtml | 9 +----- src/chrome/content/menu-overlay.xul | 11 +------ src/chrome/content/torbutton.js | 46 +++++------------------------- src/chrome/locale/en/aboutTor.dtd | 2 -- src/chrome/locale/en/torbutton.dtd | 2 -- src/chrome/skin/aboutTor.css | 4 --- 6 files changed, 9 insertions(+), 65 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index c1207ed..2fffb2a 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -241,14 +241,7 @@ window.addEventListener("pageshow", function() { <div class="bubble"> <h1>&aboutTor.whatnextQuestion.label;</h1> <p>&aboutTor.whatnextAnswer.label;</p> - <ul> - <li class="showForManual"> - <a href="&aboutTor.torbrowser_user_manual.link;"> - &aboutTor.torbrowser_user_manual.label; - </a> - </li> - <li><a href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a></li> - </ul> + <a class="tips" href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a> </div> <div class="bubble"> diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index 8067b5c..ceadf85 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?>  -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> - + <overlay id="torbutton-menu-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <menupopup id="menu_HelpPopup"> -  <menuitem id="menu_openHelp" removeelement="true"/> <menuitem id="menu_openTour" removeelement="true"/> <menuitem id="healthReport" removeelement="true"/> @@ -16,12 +14,5 @@  <box id="menu_HelpPopup_reportPhishingtoolmenu"/> <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> -  - <menuitem name="torBrowserUserManual" - id="torBrowserUserManual" - position="1" - label="&torbutton.torbrowser_user_manual.label;" - accesskey="&torbutton.torbrowser_user_manual.accesskey;" - oncommand="torbutton_open_torbrowser_user_manual()" /> </menupopup> </overlay> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5d494fa..7de599d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,7 +12,6 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); -let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -201,7 +200,7 @@ var torbutton_tor_check_observer = { // Update all open about:tor pages. If the user does not have an // about:tor page open in the front most window, open one. - if (torbutton_update_all_abouttor_pages(undefined, undefined, false) < 1) { + if (torbutton_update_all_abouttor_pages(undefined, false) < 1) { var wm = Cc["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); var win = wm.getMostRecentWindow("navigator:browser"); @@ -361,7 +360,7 @@ function torbutton_init() { // Detect toolbar customization and update arrow on about:tor pages. window.addEventListener("aftercustomization", function() { - torbutton_update_all_abouttor_pages(undefined, undefined, undefined); + torbutton_update_all_abouttor_pages(undefined, undefined); }, false); //setting up context menu @@ -400,8 +399,6 @@ function torbutton_init() { quantizeBrowserSize(window, 100, 100); - torbutton_init_user_manual_links(); - torbutton_log(3, 'init completed'); } @@ -568,7 +565,7 @@ function torbutton_notify_if_update_needed() { setOrClearAttribute(btn, "tbUpdateNeeded", updateNeeded); // Update all open about:tor pages. - torbutton_update_all_abouttor_pages(updateNeeded, undefined, undefined); + torbutton_update_all_abouttor_pages(updateNeeded, undefined); // Make the "check for update" menu item bold if an update is needed. var item = document.getElementById("torbutton-checkForUpdate"); @@ -597,11 +594,9 @@ function torbutton_check_for_update() { // Pass undefined for a parameter to have this function determine it. // Returns a count of open pages that were updated, -function torbutton_update_all_abouttor_pages(aUpdateNeeded, aShowManual, aTorIsOn) { +function torbutton_update_all_abouttor_pages(aUpdateNeeded, aTorIsOn) { if (aUpdateNeeded === undefined) aUpdateNeeded = torbutton_update_is_needed(); - if (aShowManual === undefined) - aShowManual = torbutton_show_torbrowser_manual(); if (aTorIsOn === undefined) aTorIsOn = torbutton_tor_check_ok(); @@ -612,7 +607,7 @@ function torbutton_update_all_abouttor_pages(aUpdateNeeded, aShowManual, aTorIsO for (var tab = tabs[0]; tab != null; tab = tab.nextSibling) { try { let doc = tabBrowser.getBrowserForTab(tab).contentDocument; - if (torbutton_update_abouttor_doc(doc, aTorIsOn, aShowManual, aUpdateNeeded)) + if (torbutton_update_abouttor_doc(doc, aTorIsOn, aUpdateNeeded)) ++count; } catch(e) {} } @@ -622,7 +617,7 @@ function torbutton_update_all_abouttor_pages(aUpdateNeeded, aShowManual, aTorIsO } // Returns true if aDoc is an about:tor page. -function torbutton_update_abouttor_doc(aDoc, aTorOn, aShowManual, aUpdateNeeded) { +function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { var isAboutTor = torbutton_is_abouttor_doc(aDoc); if (isAboutTor) { if (aTorOn) @@ -630,11 +625,6 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aShowManual, aUpdateNeeded) else aDoc.body.removeAttribute("toron"); - if (aShowManual) - aDoc.body.setAttribute("showmanual", "yes"); - else - aDoc.body.removeAttribute("showmanual"); - if (aUpdateNeeded) aDoc.body.setAttribute("torNeedsUpdate", "yes"); else @@ -749,9 +739,8 @@ function torbutton_on_abouttor_load(aDoc) { // Show correct Tor on/off and "update needed" status. let torOn = torbutton_tor_check_ok(); - let showManual = torbutton_show_torbrowser_manual(); let needsUpdate = torbutton_update_is_needed(); - torbutton_update_abouttor_doc(aDoc, torOn, showManual, needsUpdate); + torbutton_update_abouttor_doc(aDoc, torOn, needsUpdate); aDoc.defaultView.addEventListener("resize", function() { torbutton_update_abouttor_arrow(aDoc); }, @@ -2448,26 +2437,5 @@ function torbutton_update_noscript_button() }, 0); } -// Opens the Tor Browser User Manual in a new tab -function torbutton_open_torbrowser_user_manual() { - gBrowser.selectedTab = gBrowser.addTab("https://tb-manual.torproject.org"); -} - -// Returns true if we should show the tor browser manual. -function torbutton_show_torbrowser_manual() { - let locale = torbutton_get_general_useragent_locale(); - return locale.startsWith("en"); -} - -// Makes sure the tem in the Help Menu and the link in about:tor -// for the Tor Browser User Manual are only visible when -// torbutton_show_torbrowser_manual() returns true. -function torbutton_init_user_manual_links() { - let menuitem = document.getElementById("torBrowserUserManual"); - bindPrefAndInit("general.useragent.locale", val => { - menuitem.hidden = !torbutton_show_torbrowser_manual(); - torbutton_update_all_abouttor_pages(undefined, undefined, undefined); - }); -} //vim:set ts=4 diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 9e44fc2..12313c4 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -32,8 +32,6 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> <!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> -<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "You Can Help!"> <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> <!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index c67ec6e..97a994f 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -59,5 +59,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> -<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> -<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 1971f06..0a196dc 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -132,10 +132,6 @@ body[toron] .top h1 { color: #600060; } -body:not([showmanual]) .showForManual { - display: none; -} - div.hideIfTorIsUpToDate, body .top div.hideIfTorIsUpToDate h1 { color: black;

1 0

[torbutton/master] Bug 20728: Fix bad preferences.xul dimensions
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit d3aa9fed9b0feffd5cc046d0729fc90c7c53c96e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 21 10:15:53 2016 -0800 Bug 20728: Fix bad preferences.xul dimensions --- src/chrome/content/preferences.xul | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index c6432e0..bb6e31f 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -13,9 +13,9 @@ onload="torbutton_init_security_ui()" align="stretch" pack="center" - maxheight="300" - minwidth="300" - maxwidth="400" + maxheight="350" + minwidth="400" + maxwidth="600" ondialogaccept="torbutton_save_security_settings()" width="400" > @@ -57,9 +57,7 @@ </vbox> </hbox> </vbox> -  - <vbox flex="1" width="300" style="overflow: auto;"> + <vbox flex="1" width="400" style="overflow: auto;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0

[torbutton/master] Bug 20614: Add links to Tor Browser User Manual
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 8a5dc8c510331714e84feb2b8d4369abf76b8e20 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 11 20:03:15 2016 -0800 Bug 20614: Add links to Tor Browser User Manual --- src/chrome/content/aboutTor/aboutTor.xhtml | 9 +++++- src/chrome/content/menu-overlay.xul | 11 ++++++- src/chrome/content/torbutton.js | 46 +++++++++++++++++++++++++----- src/chrome/locale/en/aboutTor.dtd | 2 ++ src/chrome/locale/en/torbutton.dtd | 2 ++ src/chrome/skin/aboutTor.css | 4 +++ 6 files changed, 65 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 2fffb2a..c1207ed 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -241,7 +241,14 @@ window.addEventListener("pageshow", function() { <div class="bubble"> <h1>&aboutTor.whatnextQuestion.label;</h1> <p>&aboutTor.whatnextAnswer.label;</p> - <a class="tips" href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a> + <ul> + <li class="showForManual"> + <a href="&aboutTor.torbrowser_user_manual.link;"> + &aboutTor.torbrowser_user_manual.label; + </a> + </li> + <li><a href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a></li> + </ul> </div> <div class="bubble"> diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index ceadf85..8067b5c 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>  - +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + <overlay id="torbutton-menu-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <menupopup id="menu_HelpPopup"> +  <menuitem id="menu_openHelp" removeelement="true"/> <menuitem id="menu_openTour" removeelement="true"/> <menuitem id="healthReport" removeelement="true"/> @@ -14,5 +16,12 @@  <box id="menu_HelpPopup_reportPhishingtoolmenu"/> <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> +  + <menuitem name="torBrowserUserManual" + id="torBrowserUserManual" + position="1" + label="&torbutton.torbrowser_user_manual.label;" + accesskey="&torbutton.torbrowser_user_manual.accesskey;" + oncommand="torbutton_open_torbrowser_user_manual()" /> </menupopup> </overlay> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7de599d..5d494fa 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,6 +12,7 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); +let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -200,7 +201,7 @@ var torbutton_tor_check_observer = { // Update all open about:tor pages. If the user does not have an // about:tor page open in the front most window, open one. - if (torbutton_update_all_abouttor_pages(undefined, false) < 1) { + if (torbutton_update_all_abouttor_pages(undefined, undefined, false) < 1) { var wm = Cc["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); var win = wm.getMostRecentWindow("navigator:browser"); @@ -360,7 +361,7 @@ function torbutton_init() { // Detect toolbar customization and update arrow on about:tor pages. window.addEventListener("aftercustomization", function() { - torbutton_update_all_abouttor_pages(undefined, undefined); + torbutton_update_all_abouttor_pages(undefined, undefined, undefined); }, false); //setting up context menu @@ -399,6 +400,8 @@ function torbutton_init() { quantizeBrowserSize(window, 100, 100); + torbutton_init_user_manual_links(); + torbutton_log(3, 'init completed'); } @@ -565,7 +568,7 @@ function torbutton_notify_if_update_needed() { setOrClearAttribute(btn, "tbUpdateNeeded", updateNeeded); // Update all open about:tor pages. - torbutton_update_all_abouttor_pages(updateNeeded, undefined); + torbutton_update_all_abouttor_pages(updateNeeded, undefined, undefined); // Make the "check for update" menu item bold if an update is needed. var item = document.getElementById("torbutton-checkForUpdate"); @@ -594,9 +597,11 @@ function torbutton_check_for_update() { // Pass undefined for a parameter to have this function determine it. // Returns a count of open pages that were updated, -function torbutton_update_all_abouttor_pages(aUpdateNeeded, aTorIsOn) { +function torbutton_update_all_abouttor_pages(aUpdateNeeded, aShowManual, aTorIsOn) { if (aUpdateNeeded === undefined) aUpdateNeeded = torbutton_update_is_needed(); + if (aShowManual === undefined) + aShowManual = torbutton_show_torbrowser_manual(); if (aTorIsOn === undefined) aTorIsOn = torbutton_tor_check_ok(); @@ -607,7 +612,7 @@ function torbutton_update_all_abouttor_pages(aUpdateNeeded, aTorIsOn) { for (var tab = tabs[0]; tab != null; tab = tab.nextSibling) { try { let doc = tabBrowser.getBrowserForTab(tab).contentDocument; - if (torbutton_update_abouttor_doc(doc, aTorIsOn, aUpdateNeeded)) + if (torbutton_update_abouttor_doc(doc, aTorIsOn, aShowManual, aUpdateNeeded)) ++count; } catch(e) {} } @@ -617,7 +622,7 @@ function torbutton_update_all_abouttor_pages(aUpdateNeeded, aTorIsOn) { } // Returns true if aDoc is an about:tor page. -function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { +function torbutton_update_abouttor_doc(aDoc, aTorOn, aShowManual, aUpdateNeeded) { var isAboutTor = torbutton_is_abouttor_doc(aDoc); if (isAboutTor) { if (aTorOn) @@ -625,6 +630,11 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { else aDoc.body.removeAttribute("toron"); + if (aShowManual) + aDoc.body.setAttribute("showmanual", "yes"); + else + aDoc.body.removeAttribute("showmanual"); + if (aUpdateNeeded) aDoc.body.setAttribute("torNeedsUpdate", "yes"); else @@ -739,8 +749,9 @@ function torbutton_on_abouttor_load(aDoc) { // Show correct Tor on/off and "update needed" status. let torOn = torbutton_tor_check_ok(); + let showManual = torbutton_show_torbrowser_manual(); let needsUpdate = torbutton_update_is_needed(); - torbutton_update_abouttor_doc(aDoc, torOn, needsUpdate); + torbutton_update_abouttor_doc(aDoc, torOn, showManual, needsUpdate); aDoc.defaultView.addEventListener("resize", function() { torbutton_update_abouttor_arrow(aDoc); }, @@ -2437,5 +2448,26 @@ function torbutton_update_noscript_button() }, 0); } +// Opens the Tor Browser User Manual in a new tab +function torbutton_open_torbrowser_user_manual() { + gBrowser.selectedTab = gBrowser.addTab("https://tb-manual.torproject.org"); +} + +// Returns true if we should show the tor browser manual. +function torbutton_show_torbrowser_manual() { + let locale = torbutton_get_general_useragent_locale(); + return locale.startsWith("en"); +} + +// Makes sure the tem in the Help Menu and the link in about:tor +// for the Tor Browser User Manual are only visible when +// torbutton_show_torbrowser_manual() returns true. +function torbutton_init_user_manual_links() { + let menuitem = document.getElementById("torBrowserUserManual"); + bindPrefAndInit("general.useragent.locale", val => { + menuitem.hidden = !torbutton_show_torbrowser_manual(); + torbutton_update_all_abouttor_pages(undefined, undefined, undefined); + }); +} //vim:set ts=4 diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 12313c4..9e44fc2 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -32,6 +32,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> <!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "You Can Help!"> <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> <!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 97a994f..c67ec6e 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 0a196dc..1971f06 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -132,6 +132,10 @@ body[toron] .top h1 { color: #600060; } +body:not([showmanual]) .showForManual { + display: none; +} + div.hideIfTorIsUpToDate, body .top div.hideIfTorIsUpToDate h1 { color: black;

1 0

[torbutton/master] Bug 20701: Allow the directory listing stylesheet in the content policy.
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 15496115caf82ed6865fa219c2eed4bc59363388 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Nov 17 18:54:41 2016 +0000 Bug 20701: Allow the directory listing stylesheet in the content policy. --- src/components/content-policy.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index 3379eb7..5c0ecf5 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -37,6 +37,9 @@ ContentPolicy.prototype = { // Resizing text boxes. "chrome://global/content/bindings/resizer.xml": Ci.nsIContentPolicy.TYPE_XBL, + + // Directory listing. + "chrome://global/skin/dirListing/dirListing.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, }, shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) {

1 0

[torbutton/master] Bug 20318: Remove helpdesk link from about:tor
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 4f8b3fb92c080f25b4e80e59a377fae1e1b0c1fb Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 19 18:50:26 2016 +0000 Bug 20318: Remove helpdesk link from about:tor --- src/chrome/content/aboutTor/aboutTor.xhtml | 3 --- src/chrome/locale/en/aboutTor.dtd | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index b6860d8..2fffb2a 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -206,9 +206,6 @@ window.addEventListener("pageshow", function() { <h1>&aboutTor.failure.label;</h1> <br/> <h2>&aboutTor.failure2.label;</h2> - <br/> - <h3>&aboutTor.failure3prefix.label;<a href="mailto:&aboutTor.failure3Link;" ->&aboutTor.failure3Link;</a>&aboutTor.failure3suffix.label;</h3> </div> </div> <div class="top"> diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index d44f164..12313c4 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -17,9 +17,6 @@ <!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> <!ENTITY aboutTor.failure.label "Something Went Wrong!"> <!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Search">

1 0

[tor-browser/tor-browser-45.5.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit c556cdac99fcf4570feb4cfdb676fc56d384a101 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 18 12:01:44 2016 +0000 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. This fixes bug 20709. --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 64ab700..ce16a75 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -147,7 +147,7 @@ pref("app.update.badge", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus1.torproject.org/dist/torbrowser/update_2/%CHANNEL%/%BUILD_TARGE…"); +pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%V…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section

1 0

[tor-browser-bundle/master] Bug 20704: fix mar files code signing check
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 234b76caf9c9743a43fcd1ff08f6f180ee981b20 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 17 22:53:43 2016 +0100 Bug 20704: fix mar files code signing check --- tools/update-responses/config.yml | 1 - tools/update-responses/update_responses | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 786030d..2e48e2c 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -3,7 +3,6 @@ appname_marfile: tor-browser appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser appname_bundle_win: torbrowser-install -appdir_osx: TorBrowser.app releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index fd59132..b61e379 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -200,8 +200,8 @@ sub create_incremental_mar { extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B"); if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { - unless (-f "$tmpdir/A/$config->{appdir_osx}/Contents/_CodeSignature/CodeResources" - && -f "$tmpdir/B/$config->{appdir_osx}/Contents/_CodeSignature/CodeResources") { + unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" + && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") { exit_error "Missing code signature while creating $mar_file"; } }

1 0

[tor-browser-bundle/master] Bug 20706: make it possible to use dmg2mar in Tor Messenger
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 27e05dc5e3257afd2dbd11d83317001eee70b5f5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Nov 18 00:04:33 2016 +0100 Bug 20706: make it possible to use dmg2mar in Tor Messenger --- tools/dmg2mar | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/dmg2mar b/tools/dmg2mar index 8eaebe8..51d6acb 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -35,6 +35,12 @@ use File::Find; use Parallel::ForkManager; use Cwd; +# If the application is not TorBrowser (for instance, TorMessenger) +# set the application name in the TOR_APPNAME_BUNDLE_OSX and in +# the TOR_APPNAME_MARFILE environment variables +my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'TorBrowser'; +my $appname_mar = $ENV{TOR_APPNAME_MARFILE} // 'tor-browser'; + sub exit_error { print STDERR "Error: ", $_[0], "\n"; chdir '/'; @@ -89,7 +95,7 @@ sub get_dmg_files_from_sha256sums { foreach my $line (read_file('sha256sums-unsigned-build.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^TorBrowser-(.+)-osx64_(.+)\.dmg$/; + next unless $filename =~ m/^$appname-(.+)-osx64_(.+)\.dmg$/; push @files, { filename => $filename, version => $1, lang => $2 }; } return @files; @@ -103,7 +109,7 @@ sub convert_files { # internally on OSX, but the dmg file still uses 'ja' to avoid # confusing users. my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang}; - my $output = "tor-browser-osx64-$file->{version}_$mar_lang.mar"; + my $output = "$appname_mar-osx64-$file->{version}_$mar_lang.mar"; my $step_name = "$file->{filename} -> $output"; print "Starting $step_name\n"; $pm->start($step_name) and next; @@ -121,7 +127,7 @@ sub convert_files { unless system('mar', '-C', $tmpdir_oldmar, '-x', $oldmar) == 0; my $wanted = sub { my $file = $File::Find::name; - $file =~ s{^$tmpdir/TorBrowser\.app/}{}; + $file =~ s{^$tmpdir/$appname\.app/}{}; if (-f "$tmpdir_oldmar/$file") { my (undef, undef, $mode) = stat("$tmpdir_oldmar/$file"); chmod $mode, $File::Find::name; @@ -130,11 +136,11 @@ sub convert_files { chmod 0644, $File::Find::name if -f $File::Find::name; chmod 0755, $File::Find::name if -d $File::Find::name; }; - find($wanted, "$tmpdir/TorBrowser.app"); + find($wanted, "$tmpdir/$appname.app"); unlink $output; (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', - $output, "$tmpdir/TorBrowser.app"); + $output, "$tmpdir/$appname.app"); exit_error "Error updating $output: $err" unless $success; $pm->finish; } @@ -147,7 +153,7 @@ sub remove_incremental_mars { foreach my $line (read_file('sha256sums-unsigned-build.incrementals.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^tor-browser-osx64.+\.incremental\.mar$/; + next unless $filename =~ m/^$appname_mar-osx64.+\.incremental\.mar$/; next unless -f $filename; print "Removing $filename\n"; unlink $filename;

1 0

[tor-browser-bundle/master] Folding in 6.0.6 and 6.5a4-hardened changelogs
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 1762f089c0aa6fbf4e4c8b7e539c6ee8a61d74dc Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 18 11:14:55 2016 +0000 Folding in 6.0.6 and 6.5a4-hardened changelogs --- Bundle-Data/Docs/ChangeLog.txt | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 021055f..4f57467 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,51 @@ +Tor Browser 6.5a4-hardened -- November 16 2016 + * All Platforms + * Update Firefox to 45.5.0esr + * Update Tor to 0.2.9.5-alpha + * Update OpenSSL to 1.0.2j + * Update Torbutton to 1.9.6.7 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Bug 20111: use Unix domain sockets for SOCKS port by default + * Bug 19459: Move resizing code to tor-browser.git + * Bug 20264: Change security slider to 3 options + * Bug 20347: Enhance security slider's custom mode + * Bug 20123: Disable remote jar on all security levels + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 17546: Add tooltips to explain our privacy checkboxes + * Bug 17904: Allow security settings dialog to resize + * Bug 18093: Remove 'Restore Defaults' button + * Bug 20373: Prevent redundant dialogs opening + * Bug 20388+20399+20394: Code clean-up + * Translation updates + * Update Tor Launcher to 0.2.11.1 + * Bug 20111: use Unix domain sockets for SOCKS port by default + * Bug 20185: Avoid using Unix domain socket paths that are too long + * Bug 20429: Do not open progress window if tor doesn't get started + * Bug 19646: Wrong location for meek browser profile on OS X + * Translation updates + * Update HTTPS-Everywhere to 5.2.7 + * Update meek to 0.25 + * Bug 19646: Wrong location for meek browser profile on OS X + * Bug 20030: Shut down meek-http-helper cleanly if built with Go > 1.5.4 + * Bug 20304: Support spaces and other special characters for SOCKS socket + * Bug 20490: Fix assertion failure due to fix for #20304 + * Bug 19459: Size new windows to 1000x1000 or nearest 200x100 (Firefox patch) + * Bug 20442: Backport fix for local path disclosure after drag and drop + * Bug 20160: Backport fix for broken MP3-playback + * Bug 20043: Isolate SharedWorker script requests to first party + * Bug 20123: Always block remote jar files + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 19838: Add dgoulet's bridge and add another one commented out + * Bug 19481: Point the update URL to aus1.torproject.org + * Bug 20296: Rotate ports again for default obfs4 bridges + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 20399+15852: Code clean-up + * Bug 15953: Weird resizing dance on Tor Browser startup + * Build system + * All platforms + * Bug 20023: Upgrade Go to 1.7.3 + * Bug 20583: Make the downloads.json file reproducible + Tor Browser 6.5a4 -- November 16 2016 * All Platforms * Update Firefox to 45.5.0esr @@ -60,6 +108,34 @@ Tor Browser 6.5a4 -- November 16 2016 * Bug 20184: Make OS X builds reproducible again * Bug 20210: In dmg2mar, extract old mar file to copy permissions to the new one +Tor Browser 6.0.6 -- November 15 + * All Platforms + * Update Firefox to 45.5.0esr + * Update Tor to 0.2.8.9 + * Update OpenSSL to 1.0.1u + * Update Torbutton to 1.9.5.12 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Translation updates + * Update Tor Launcher to 0.2.9.4 + * Bug 20429: Do not open progress window if tor doesn't get started + * Bug 19646: Wrong location for meek browser profile on OS X + * Update HTTPS-Everywhere to 5.2.7 + * Update meek to 0.25 + * Bug 19646: Wrong location for meek browser profile on OS X + * Bug 20030: Shut down meek-http-helper cleanly if built with Go > 1.5.4 + * Bug 19838: Add dgoulet's bridge and add another one commented out + * Bug 20296: Rotate ports again for default obfs4 bridges + * Bug 19735: Switch default search engine to DuckDuckGo + * Bug 20118: Don't unpack HTTPS Everywhere anymore + * Windows + * Bug 20342: Add tor-gencert.exe to expert bundle + * OS X + * Bug 20204: Windows don't drag on macOS Sierra anymore + * Bug 20250: Meek fails on macOS Sierra if built with Go < 1.7 + * Build system + * All platforms + * Bug 20023: Upgrade Go to 1.7.3 + Tor Browser 6.5a3-hardened -- September 20 2016 * All Platforms * Update Firefox to 45.4.0esr

1 0

[tor-browser-bundle/maint-6.0] Picking up the final banner changes
by gk＠torproject.org 15 Nov '16

15 Nov '16

commit 7cdc9a89a33c9f0c61294424de584fcaf5012a63 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 15 07:53:49 2016 +0000 Picking up the final banner changes --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 75a6fc3..dd961a1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.0.6 -- November 15 * Update Firefox to 45.5.0esr * Update Tor to 0.2.8.9 * Update OpenSSL to 1.0.1u - * Update Torbutton to 1.9.5.10 + * Update Torbutton to 1.9.5.12 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Translation updates * Update Tor Launcher to 0.2.9.4 diff --git a/gitian/versions b/gitian/versions index 0c0cec0..6fed387 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build3 TOR_TAG=tor-0.2.8.9 TORLAUNCHER_TAG=0.2.9.4 -TORBUTTON_TAG=1.9.5.11 +TORBUTTON_TAG=1.9.5.12 HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/maint-1.9.5] Version bump to pick up latest banner changes
by gk＠torproject.org 15 Nov '16

15 Nov '16

commit 07624f2b158bdbf17f8ae36fd7206cf850012508 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 15 07:44:41 2016 +0000 Version bump to pick up latest banner changes --- src/CHANGELOG | 2 +- src/install.rdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0ac3291..2294b4e 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,4 +1,4 @@ -1.9.5.11 +1.9.5.12 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Translation updates diff --git a/src/install.rdf b/src/install.rdf index 12a67bc..2d45e80 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.5.11</em:version> + <em:version>1.9.5.12</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-1.9.5] Bug 20414.5: Fix nonrendering arrow
by gk＠torproject.org 15 Nov '16

15 Nov '16

commit e22642323f09efd18b4315d0b7145a781bb3dbdc Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 23 21:05:37 2016 -0800 Bug 20414.5: Fix nonrendering arrow --- src/chrome/content/aboutTor/donation_banner.js | 2 +- src/chrome/skin/donation_banner.css | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 0953ed2..2b59fd4 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -146,7 +146,7 @@ let runDonationBanner = function () { gStringBundle.GetStringFromName("aboutTor.donationBanner.heart"); sel("#banner-donate-button-text span").innerHTML = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - sel("#banner-donate-button-arrow").innerHTML = "⟶"; + sel("#banner-donate-button-arrow").innerHTML = "»"; sel("#banner").style.display = "flex"; sel("#banner-spacer").style.display = "block"; addEventListener("resize", updateTextSizes); diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index 06d6194..1d21641 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -127,11 +127,8 @@ } #banner-donate-button-arrow { flex: 1 1 33%; - font-size: 14px; - line-height: 14px; -} -#banner-donate-button-arrow:-moz-dir(rtl) { - transform: scaleX(-1); + font-size: 24px; + line-height: 24px; } #banner-donate-button-link { flex: 0 0 auto;

1 0

[torbutton/master] Bug 20414.5: Fix nonrendering arrow
by gk＠torproject.org 15 Nov '16

15 Nov '16

commit 0a5af31aed37e4fd9faec408455b2d4ae139841e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 23 21:05:37 2016 -0800 Bug 20414.5: Fix nonrendering arrow --- src/chrome/content/aboutTor/donation_banner.js | 2 +- src/chrome/skin/donation_banner.css | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 0953ed2..2b59fd4 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -146,7 +146,7 @@ let runDonationBanner = function () { gStringBundle.GetStringFromName("aboutTor.donationBanner.heart"); sel("#banner-donate-button-text span").innerHTML = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - sel("#banner-donate-button-arrow").innerHTML = "⟶"; + sel("#banner-donate-button-arrow").innerHTML = "»"; sel("#banner").style.display = "flex"; sel("#banner-spacer").style.display = "block"; addEventListener("resize", updateTextSizes); diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index 06d6194..1d21641 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -127,11 +127,8 @@ } #banner-donate-button-arrow { flex: 1 1 33%; - font-size: 14px; - line-height: 14px; -} -#banner-donate-button-arrow:-moz-dir(rtl) { - transform: scaleX(-1); + font-size: 24px; + line-height: 24px; } #banner-donate-button-link { flex: 0 0 auto;

1 0

[tor-browser-bundle/hardened-builds] Bumping tor-browser branch for hardened nightlies
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 1cec0b4eff14c753c2bc2ece022926350e03e297 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:41:26 2016 +0000 Bumping tor-browser branch for hardened nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index ffa3809..56af58d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.4.0esr +FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=default

1 0

[tor-browser-bundle/master] Bumping tor-browser branch for nightlies
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 378d6fe95d797ecca6b8aebda169b333da7ec8db Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:39:42 2016 +0000 Bumping tor-browser branch for nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f9cfbfb..1a3bc8b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.4.0esr +FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=default

1 0

[tor-launcher/master] Version bump (0.2.11.1)
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 81b73ec3c046ee7eb6bff42019596e34815fddec Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:32:16 2016 +0000 Version bump (0.2.11.1) --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 48599a7..493d976 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.11</em:version> + <em:version>0.2.11.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-browser-bundle/hardened-builds] Release preparations for 6.5a4-hardened
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 0cbe69dbc243ee09a9c536ed43ef705609c68e1e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:06:44 2016 +0000 Release preparations for 6.5a4-hardened Version bumps, Changelog update, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 48 +++++++++++++++++++++++++++++++++++++++ gitian/versions.alpha | 16 ++++++------- tools/update-responses/config.yml | 10 ++++---- 3 files changed, 61 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 68a9d43..fd5b60e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,51 @@ +Tor Browser 6.5a4-hardened -- November 16 2016 + * All Platforms + * Update Firefox to 45.5.0esr + * Update Tor to 0.2.9.5-alpha + * Update OpenSSL to 1.0.2j + * Update Torbutton to 1.9.6.7 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Bug 20111: use Unix domain sockets for SOCKS port by default + * Bug 19459: Move resizing code to tor-browser.git + * Bug 20264: Change security slider to 3 options + * Bug 20347: Enhance security slider's custom mode + * Bug 20123: Disable remote jar on all security levels + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 17546: Add tooltips to explain our privacy checkboxes + * Bug 17904: Allow security settings dialog to resize + * Bug 18093: Remove 'Restore Defaults' button + * Bug 20373: Prevent redundant dialogs opening + * Bug 20388+20399+20394: Code clean-up + * Translation updates + * Update Tor Launcher to 0.2.11.1 + * Bug 20111: use Unix domain sockets for SOCKS port by default + * Bug 20185: Avoid using Unix domain socket paths that are too long + * Bug 20429: Do not open progress window if tor doesn't get started + * Bug 19646: Wrong location for meek browser profile on OS X + * Translation updates + * Update HTTPS-Everywhere to 5.2.7 + * Update meek to 0.25 + * Bug 19646: Wrong location for meek browser profile on OS X + * Bug 20030: Shut down meek-http-helper cleanly if built with Go > 1.5.4 + * Bug 20304: Support spaces and other special characters for SOCKS socket + * Bug 20490: Fix assertion failure due to fix for #20304 + * Bug 19459: Size new windows to 1000x1000 or nearest 200x100 (Firefox patch) + * Bug 20442: Backport fix for local path disclosure after drag and drop + * Bug 20160: Backport fix for broken MP3-playback + * Bug 20043: Isolate SharedWorker script requests to first party + * Bug 20123: Always block remote jar files + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 19838: Add dgoulet's bridge and add another one commented out + * Bug 19481: Point the update URL to aus1.torproject.org + * Bug 20296: Rotate ports again for default obfs4 bridges + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 20399+15852: Code clean-up + * Bug 15953: Weird resizing dance on Tor Browser startup + * Build system + * All platforms + * Bug 20023: Upgrade Go to 1.7.3 + * Bug 20583: Make the downloads.json file reproducible + Tor Browser 6.5a3-hardened -- September 20 2016 * All Platforms * Update Firefox to 45.4.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 02e2bbd..c22ed9f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,15 +14,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.4.0esr +FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=hardened -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 -TOR_TAG=tor-0.2.9.2-alpha -TORLAUNCHER_TAG=0.2.11 -TORBUTTON_TAG=1.9.6.4 -HTTPSE_TAG=5.2.4 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build3 +TOR_TAG=tor-0.2.9.5-alpha +TORLAUNCHER_TAG=0.2.11.1 +TORBUTTON_TAG=1.9.6.7 +HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -49,7 +49,7 @@ SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4-1 -OPENSSL_VER=1.0.2h +OPENSSL_VER=1.0.2j GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -104,7 +104,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 +OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 022cea2..67d63c9 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,7 +20,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 6.5a3-hardened + hardened: 6.5a4-hardened release: 6.0.1 versions: 6.0.1: @@ -33,11 +33,11 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.5a3-hardened: - platformVersion: 45.4.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-65a3-hardened-released + 6.5a4-hardened: + platformVersion: 45.5.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-65a4-hardened-released incremental_from: - - 6.5a2-hardened + - 6.5a3-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Pick up banner changes and DuckDuckGo fix
by gk＠torproject.org 13 Nov '16

13 Nov '16

commit 7eda07be5c2afbd7f3a6ae36941520de71a91725 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Nov 13 10:05:04 2016 +0000 Pick up banner changes and DuckDuckGo fix --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- gitian/versions.alpha | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 424f09b..021055f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.5a4 -- November 16 2016 * Update Firefox to 45.5.0esr * Update Tor to 0.2.9.5-alpha * Update OpenSSL to 1.0.2j - * Update Torbutton to 1.9.6.6 + * Update Torbutton to 1.9.6.7 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Bug 20111: use Unix domain sockets for SOCKS port by default * Bug 19459: Move resizing code to tor-browser.git @@ -38,6 +38,7 @@ Tor Browser 6.5a4 -- November 16 2016 * Bug 19838: Add dgoulet's bridge and add another one commented out * Bug 19481: Point the update URL to aus1.torproject.org * Bug 20296: Rotate ports again for default obfs4 bridges + * Bug 20651: DuckDuckGo does not work with JavaScript disabled * Bug 20399+15852: Code clean-up * Windows * Bug 20342: Add tor-gencert.exe to expert bundle diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a8fff36..432cf29 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,10 +14,10 @@ FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build3 TOR_TAG=tor-0.2.9.5-alpha TORLAUNCHER_TAG=0.2.10.2 -TORBUTTON_TAG=1.9.6.6 +TORBUTTON_TAG=1.9.6.7 HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/master] Pickup final banner changes
by gk＠torproject.org 13 Nov '16

13 Nov '16

commit 568371300c000cae94e9fd5c0ca07bc9f8ca56c0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Nov 13 10:01:53 2016 +0000 Pickup final banner changes --- src/CHANGELOG | 2 +- src/install.rdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a89302f..35c9d59 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,4 +1,4 @@ -1.9.6.6 +1.9.6.7 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Bug 20111: use Unix domain sockets for SOCKS port by default * Bug 19459: Move resizing code to tor-browser.git diff --git a/src/install.rdf b/src/install.rdf index 994aa5c..15c9f33 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.6.6</em:version> + <em:version>1.9.6.7</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0