- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 24614: Bump meek tag for moat feature
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 86ea671920a69772ee7adb4a168f06cbd4b21168 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 19 12:12:54 2018 +0000 Bug 24614: Bump meek tag for moat feature --- projects/meek/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/meek/config b/projects/meek/config index 46f4ec9..f58fbd1 100644 --- a/projects/meek/config +++ b/projects/meek/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.25 +version: 0.29 git_url: https://git.torproject.org/pluggable-transports/meek.git git_hash: '[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser-build/master] Bug 25020: add a tbb_version.json file
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit b2201eb2571c885f45bd6632e483310b169759dc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 8 14:55:10 2018 +0100 Bug 25020: add a tbb_version.json file Add a tbb_version.json file containing informations about the installed bundle. --- projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 59fbda5..655e157 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -198,6 +198,8 @@ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/00 [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults +# create tbb_version.json file for #25020 +echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_verson.json popd # Prepare our language packs for using the proper search engines and embed @@ -327,6 +329,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults + # create tbb_version.json file for #25020 + echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_verson.json popd # Set the update.locale (it is used to replace %LOCALE% within

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25020'
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 1c625c1dcbfbb1ca0b40d965c081b3f5a8f84046 Merge: 3d47438 b2201eb Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 19 12:09:30 2018 +0000 Merge remote-tracking branch 'boklm/bug_25020' projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25178'
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 3d47438b84102e6831c0905764cb96d479e4580a Merge: 729ad3b 707cf3d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 19 12:06:56 2018 +0000 Merge remote-tracking branch 'boklm/bug_25178' projects/release/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 25178: re-enable windows-x86_64 build in 'make testbuild'
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 707cf3d03024780124ab9cda854244ca2ffbccaf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 8 15:42:20 2018 +0100 Bug 25178: re-enable windows-x86_64 build in 'make testbuild' --- projects/release/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/config b/projects/release/config index 61c6175..e48fb01 100644 --- a/projects/release/config +++ b/projects/release/config @@ -29,7 +29,7 @@ targets: torbrowser-windows-i686: 1 torbrowser-windows-x86_64: var: - torbrowser-windows-x86_64: '[% c("var/alpha") || c("var/nightly") %]' + torbrowser-windows-x86_64: '[% ! c("var/release") %]' torbrowser-osx-x86_64: var: torbrowser-osx-x86_64: 1

1 0

[tor-browser-build/master] Bug 25266: PT config should include full names of executable files
by boklm＠torproject.org 16 Feb '18

16 Feb '18

commit 729ad3b42b612829301a1231879296a77c95a35c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 15 15:56:28 2018 +0000 Bug 25266: PT config should include full names of executable files Tor Launcher's Moat client implementation uses Mozilla's Subprocess.jsm module to start the meek client, and that module requires a complete file path including the .exe suffix. For consistency, we now include the .exe suffix everywhere. --- .../Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index 2c1b636..94d7fd9 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -1,8 +1,8 @@ ## fteproxy configuration -ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --managed +ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy.exe --managed ## obfs4proxy configuration -ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy +ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy.exe ## meek configuration -ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client +ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer.exe TorBrowser\Tor\PluggableTransports\meek-client-torbrowser.exe -- TorBrowser\Tor\PluggableTransports\meek-client.exe

1 0

[tor-browser-build/master] Bug 23384: Add user mikeperry on build-sunet-a.torproject.net
by boklm＠torproject.org 10 Feb '18

10 Feb '18

commit 468b6c290e3450c2d62c89b06f68cf84e5abd8bc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Feb 10 10:10:54 2018 +0100 Bug 23384: Add user mikeperry on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/mikeperry.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index cf54157..dd92149 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -4,3 +4,4 @@ tbb_team_members: - brade - gk - mcs + - mikeperry diff --git a/tools/ansible/roles/tbb-team/files/mikeperry.pub b/tools/ansible/roles/tbb-team/files/mikeperry.pub new file mode 100644 index 0000000..277f539 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/mikeperry.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6R7SmJ88cNencqZTtUmU8cpVpOJCzEklXNIBF4y44ZO2QY9iqJdbC2vuMV68/XUP1G9rz1BOTvyyO3T4/KlvRlHiQEMOy2FObc5znVOAshEqSm450AjGAjpOClV+EpJrvd7LqGIcR6/rLZym7P4aYHkUW/C5DEvyQZUmiCnFSUv8Zh2PFOATP4Veyi0PbJvEPZ73n9QZXDq4mERa1dvwBnGIlXJwKdf3U0Eyx1rZe8OIMY9Rpn+Gq3iuk+1u4SCMiUQGNJ1diG/t40leXlhN3N2cIEBUISpPtwpmTw988UwKneKCXsdi6Dhu2XWoSHpsQrjPDmh9vbpi2yLvlgGv2Q== user@remote

1 0

[tor-browser-build/master] Bug 24995: include git hash in tor --version
by gk＠torproject.org 05 Feb '18

05 Feb '18

commit c873b63900021e29f7ac01c92145e91a7cb64fff Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 24 16:44:20 2018 +0100 Bug 24995: include git hash in tor --version --- projects/tor/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor/build b/projects/tor/build index 14ba58e..f6b507f 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -58,6 +58,8 @@ openssldir=/var/tmp/dist/openssl [% END %] cd /var/tmp/build/[% project %]-[% c('version') %] +# add git hash to micro-revision.i for #24995 +echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \

1 0

[tor-launcher/master] Bug 25089: Special characters not escaped in proxy password
by gk＠torproject.org 05 Feb '18

05 Feb '18

commit fa8590a497b492f6da62bbf7009735a17e17ec21 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Feb 2 10:59:55 2018 -0500 Bug 25089: Special characters not escaped in proxy password Modify the _strEscape() function to enclose strings in double quotes when they contain a '#' character. --- src/components/tl-protocol.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index a89b84d..ab33bd3 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -1,4 +1,4 @@ -// Copyright (c) 2017, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // TODO: Some code came from torbutton.js (pull in copyright and license?) // @@ -1046,8 +1046,8 @@ TorProtocolService.prototype = // Returns the new string. _strEscape: function(aStr) { - // Just return if all characters are printable ASCII excluding SP and " - const kSafeCharRE = /^[\x21\x23-\x7E]*$/; + // Just return if all characters are printable ASCII excluding SP, ", and # + const kSafeCharRE = /^[\x21\x24-\x7E]*$/; if (!aStr || kSafeCharRE.test(aStr)) return aStr;

1 0

[tor-browser/tor-browser-52.6.0esr-8.0-2] Bug 13575: Disable randomised Firefox HTTP cache decay user tests.
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit f6d6512bf85d964fa5a470f2528042c527523a34 Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Sat Jan 20 21:54:00 2018 +0100 Bug 13575: Disable randomised Firefox HTTP cache decay user tests. Mozilla's experiment shouldn't be collecting any data on our users. If "browser.cache.frecency_experiment" is not set in firefox.js to "-1" it will default to "0" and then it is randomised between "1" and "4" inclusive, setting different HTTP cache decay times for the four groups. --- 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 1302d2e2d6be..ca27504e4b7d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -179,6 +179,9 @@ pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable SpeechSynthe pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API +// Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) +pref("browser.cache.frecency_experiment", -1); + // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser-build/master] Fold in stable Changelog
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit e15653dc249011b6448e585d96e6f0aef3f1f262 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 2 08:17:35 2018 +0000 Fold in stable Changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5ee6e37..d591af5 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,57 @@ Tor Browser 8.0a1 -- January 23 2018 * Bug 23892: Include Firefox and Tor debug files in final build directory * Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds +Tor Browser 7.5 -- January 23 2018 + * All Platforms + * Update Firefox to 52.6.0esr + * Update Tor to 0.3.2.9 + * Update OpenSSL to 1.0.2n + * Update Torbutton to 1.9.8.5 + * Bug 21847: Update copy for security slider + * Bug 21245: Add da translation to Torbutton and keep track of it + * Bug 24702: Remove Mozilla text from banner + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + * Update Tor Launcher to 0.2.14.3 + * Bug 23262: Implement integrated progress bar + * Bug 23261: implement configuration portion of new Tor Launcher UI + * Bug 24623: Revise "country that censors Tor" text + * Bug 24624: tbb-logo.svg may cause network access + * Bug 23240: Retrieve current bootstrap progress before showing progress bar + * Bug 24428: Bootstrap error message sometimes lost + * Bug 22232: Add README on use of bootstrap status messages + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + * Update HTTPS Everywhere to 2018.1.11 + * Update NoScript to 5.1.8.3 + * Bug 23104: CSS line-height reveals the platform Tor Browser is running on + * Bug 24398: Plugin-container process exhausts memory + * Bug 22501: Requests via javascript: violate FPI + * Bug 24756: Add noisebridge01 obfs4 bridge configuration + * Windows + * Bug 16010: Enable content sandboxing on Windows + * Bug 23230: Fix build error on Windows 64 + * OS X + * Bug 24566: Avoid white flashes when opening dialogs in Tor Browser + * Bug 23025: Add some hardening flags to macOS build + * Linux + * Bug 23970: Make "Print to File" work with sandboxing enabled + * Bug 23016: "Print to File" is broken on some non-english Linux systems + * Bug 10089: Set middlemouse.contentLoadURL to false by default + * Bug 18101: Suppress upload file dialog proxy bypass (linux part) + * Android + * Bug 22084: Spoof network information API + * Build System + * All Platforms + * Switch from gitian/tor-browser-bundle to rbm/tor-browser-build + * Windows + * Bug 22563: Update mingw-w64 to fix W^X violations + * Bug 20929: Bump GCC version to 5.4.0 + * Linux + * Bug 20929: Bump GCC version to 5.4.0 + * Bug 23892: Include Firefox and Tor debug files in final build directory + * Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds + Tor Browser 7.5a10 -- December 19 2017 * All Platforms * Update Tor to 0.3.2.7-rc

1 0

[tor-browser-build/maint-7.5] Bump rbm to latest master
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit e0641719c6f52109a25304dbe438e3139d6e14f1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 2 07:22:04 2018 +0000 Bump rbm to latest master --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 5c89374..7494edc 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 5c89374df7957238a9565c0b938ee3f30f880438 +Subproject commit 7494edc6d2556c511c213823a6549410ba75f73b

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/25016'
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit f96a293d146d3dc54f8ecfaa1d3dfc669bf4198d Merge: f860499 1cf0f11 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 2 08:11:02 2018 +0000 Merge remote-tracking branch 'arthur/25016' src/chrome/content/aboutTor/aboutTor-content.js | 5 -- src/chrome/content/aboutTor/aboutTor.xhtml | 19 +--- src/chrome/content/aboutTor/donation_banner.js | 105 ---------------------- src/chrome/content/aboutTor/onion-hand.png | Bin 69055 -> 0 bytes src/chrome/content/torbutton.js | 4 +- src/chrome/skin/donation_banner.css | 113 ----------------------- src/modules/donation-banner.js | 115 ------------------------ 7 files changed, 2 insertions(+), 359 deletions(-)

1 0

[torbutton/master] Bug 25016: Remove 2017 donation banner
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit 1cf0f11380c6f9fddf2fef54966390801ba7a2b1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Jan 24 20:37:49 2018 -0800 Bug 25016: Remove 2017 donation banner The campaign is finished, so we can remove the banner. I'm leaving in the strings in case we want to use some of them next year. --- src/chrome/content/aboutTor/aboutTor-content.js | 5 -- src/chrome/content/aboutTor/aboutTor.xhtml | 19 +--- src/chrome/content/aboutTor/donation_banner.js | 105 ---------------------- src/chrome/content/aboutTor/onion-hand.png | Bin 69055 -> 0 bytes src/chrome/content/torbutton.js | 4 +- src/chrome/skin/donation_banner.css | 113 ----------------------- src/modules/donation-banner.js | 115 ------------------------ 7 files changed, 2 insertions(+), 359 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index 95e8abd..ec515bb 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -105,11 +105,6 @@ var AboutTorListener = { else body.removeAttribute("showmanual"); - if (aData.bannerData) - body.setAttribute("banner-data", aData.bannerData); - else - body.removeAttribute("banner-data"); - // Setting body.initialized="yes" displays the body, which must be done // at this point because our remaining initialization depends on elements // being visible so that their size and position are accurate. diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 0fca4b9..7ae4b8b 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -21,8 +21,6 @@ <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" href="resource://torbutton/chrome/skin/aboutTor.css"/> - <link rel="stylesheet" type="text/css" media="all" - href="resource://torbutton/chrome/skin/donation_banner.css"/> <script type="text/javascript;version=1.7"> <![CDATA[ window.addEventListener("pageshow", function() { @@ -33,21 +31,6 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> - <div id="banner"> - <div id="banner-contents-container"> - <div id="banner-tagline"><span></span></div> - <div id="banner-slogan"><span></span></div> - <a id="banner-donate-button-link" - href="https://www.torproject.org/donate/donate-pdr-tbb"> - <div id="banner-donate-button"> - <div id="banner-donate-button-inner"> - <span></span> - </div> - </div> - </a> - </div> - </div> - <div id="banner-spacer"></div> <div id="torstatus" class="top"> <div id="torstatus-version"/> <div id="torstatus-image"/> @@ -129,6 +112,6 @@ window.addEventListener("pageshow", function() { <p>&aboutTor.footer.label; <a href="&aboutTor.learnMore.link;">&aboutTor.learnMore.label;</a></p> </div> - <script src="resource://torbutton/chrome/content/aboutTor/donation_banner.js"></script> + </body> </html> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js deleted file mode 100644 index 85f6af1..0000000 --- a/src/chrome/content/aboutTor/donation_banner.js +++ /dev/null @@ -1,105 +0,0 @@ -/* jshint esnext:true */ - -let sel = selector => document.querySelector(selector); - -// Shrink the font size if the text in the given element is overflowing. -let fitTextInElement = function (element) { - element.style.fontSize = "8px"; - let defaultWidth = element.scrollWidth, - defaultHeight = element.scrollHeight; - let bestSize; - for (let testSize = 8; testSize <= 40; testSize += 0.5) { - element.style.fontSize = `${testSize}px`; - if (element.scrollWidth <= defaultWidth && - element.scrollHeight <= defaultHeight) { - bestSize = testSize; - } else { - break; - } - } - element.style.fontSize = `${bestSize}px`; -}; - -// Increase padding at end to "squeeze" text, until just before -// it gets squeezed so much that it gets longer vertically. -let avoidWidows = function (element) { - element.style.paddingRight = "0px"; - let originalWidth = element.scrollWidth; - let originalHeight = element.scrollHeight; - let bestPadding; - for (let testPadding = 0; testPadding < originalWidth; testPadding += 0.5) { - element.style.paddingRight = `${testPadding}px`; - if (element.scrollHeight <= originalHeight) { - bestPadding = testPadding; - } else { - break; - } - } - element.style.paddingRight = `${bestPadding}px`; - if (window.getComputedStyle(element).direction === "rtl") { - element.style.paddingLeft = element.style.paddingRight; - element.style.paddingRight = "0px"; - } -}; - -// Resize the text inside banner to fit. -let updateTextSizes = function () { - fitTextInElement(sel("#banner-tagline")); - fitTextInElement(sel("#banner-slogan")); - fitTextInElement(sel("#banner-donate-button-inner")); - avoidWidows(sel("#banner-tagline span")); -}; - -// Returns a random integer x, such that 0 <= x < max -let randomInteger = max => Math.floor(max * Math.random()); - -// The main donation banner function. -let runDonationBanner = function ({ taglines, slogan, mozilla, donate, shortLocale }) { - try { - sel("#banner-tagline span").innerText = taglines[randomInteger(taglines.length)]; - sel("#banner-slogan span").innerText = slogan; - let donateButtonText = sel("#banner-donate-button-inner span"); - let rtl = window.getComputedStyle(donateButtonText).direction === "rtl"; - donateButtonText.innerHTML = donate + " " + (rtl ? "◀" : "▶"); - sel("#banner").style.display = "flex"; - sel("#banner-spacer").style.display = "block"; - addEventListener("resize", updateTextSizes); - updateTextSizes(); - // Add a suffix corresponding to locale so we can send user - // to a correctly-localized donation page via redirect. - sel("#banner-donate-button-link").href += "-" + shortLocale; - sel("#torstatus-image").style.display = "none"; - } catch (e) { - // Something went wrong. - console.error(e); - sel("#banner").style.display = "none"; - sel("#bannerSpacer").style.display = "none"; - sel("#torstatus-image").style.display = "block"; - } -}; - -// Calls callback(attributeValue) when the specified attribute changes on -// target. Returns a zero-arg function that stops observing. -let observeAttribute = function (target, attributeName, callback) { - let observer = new MutationObserver(mutations => { - mutations.forEach(mutation => { - if (mutation.type === "attributes" && - mutation.attributeName === attributeName) { - callback(target.getAttribute(attributeName)); - } - }); - }); - observer.observe(target, { attributes: true }); - return () => observer.disconnect(); -}; - -// Start the donation banner if "toron" has been set to "yes". -let stopObserving = observeAttribute(document.body, "toron", value => { - stopObserving(); - if (value === "yes") { - let bannerDataJSON = document.body.getAttribute("banner-data"); - if (bannerDataJSON && bannerDataJSON.length > 0) { - runDonationBanner(JSON.parse(bannerDataJSON)); - } - } -}); diff --git a/src/chrome/content/aboutTor/onion-hand.png b/src/chrome/content/aboutTor/onion-hand.png deleted file mode 100644 index 00a5a41..0000000 Binary files a/src/chrome/content/aboutTor/onion-hand.png and /dev/null differ diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9abc1c5..64aa5b0 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -13,7 +13,6 @@ 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, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); -let { bannerData } = Cu.import("resource://torbutton/modules/donation-banner.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -451,8 +450,7 @@ var torbutton_abouttor_message_handler = { torOn: torbutton_tor_check_ok(), updateNeeded: torbutton_update_is_needed(), showManual: torbutton_show_torbrowser_manual(), - toolbarButtonXPos: torbutton_get_toolbarbutton_xpos(), - bannerData: bannerData(), + toolbarButtonXPos: torbutton_get_toolbarbutton_xpos() }; }, diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css deleted file mode 100644 index dd9d7be..0000000 --- a/src/chrome/skin/donation_banner.css +++ /dev/null @@ -1,113 +0,0 @@ -#banner { - -khtml-user-select: none; /* Konqueror */ - -moz-user-select: none; /* Firefox */ - -ms-user-select: none; /* Internet Explorer/Edge */ - -webkit-touch-callout: none; /* iOS Safari */ - -webkit-user-select: none; /* Chrome/Safari/Opera */ - display: none; - height: 150px; - justify-content: center; - left: 0px; - margin-top: 0px; - min-width: 900px; - opacity: 1; - position: absolute; - user-select: none; - width: 100%; - z-index: 1; -} -#banner:before { - background-color: #406; - background-image: url('resource://torbutton/chrome/content/aboutTor/onion-hand.png'); - background-position: center; - background-size: cover; - content: ""; - height: 150px; - left: 0px; - position: absolute; - top: 0px; - width: 100%; -} -#banner:-moz-dir(rtl):before { - transform: scaleX(-1); -} -#banner-contents-container { - align-items: center; - height: 100%; - max-width: 700px; - position: relative; - width: 700px; -} -#banner-tagline { - align-items: center; - bottom: 60px; - color: white; - display: flex; - font-family: monospace; - font-size: 8px; - font-weight: bold; - left: 85px; - position: absolute; - right: 0px; - text-align: start; - text-transform: uppercase; - top: 10px; -} -#banner-tagline:-moz-dir(rtl) { - left: 0px; - right: 85px; -} -#banner-slogan { - align-items: center; - bottom: 30px; - color: #f8f8a0; - display: flex; - font-family: monospace; - font-weight: bold; - left: 85px; - position: absolute; - right: 285px; - text-align: start; - top: 90px; - white-space: nowrap; -} -#banner-slogan:-moz-dir(rtl) { - left: 285px; - right: 85px; -} -#banner-donate-button { - background-color: #13a513; - border: 0px; - bottom: 10px; - color: #fbf7ef; - font-family: sans-serif; - font-size: 12px; - font-weight: bold; - left: 430px; - letter-spacing: -0.00em; - position: absolute; - right: 0px; - top: 100px; -} -#banner-donate-button:-moz-dir(rtl) { - left: 0px; - right: 430px; -} -#banner-donate-button:hover { - background-color: #38bc38; -} -#banner-donate-button-inner { - bottom: 6px; - display: flex; - justify-content: center; - left: 8px; - position: absolute; - right: 8px; - top: 6px; -} -#banner-spacer { - display: none; - height: 150px; - position: relative; - top: 0; -} diff --git a/src/modules/donation-banner.js b/src/modules/donation-banner.js deleted file mode 100644 index 6c205fe..0000000 --- a/src/modules/donation-banner.js +++ /dev/null @@ -1,115 +0,0 @@ -/* jshint esversion:6 */ - -const Cu = Components.utils; - -// ### Import Mozilla Services -Cu.import("resource://gre/modules/Services.jsm"); - -// A list of locales for which the banner has been translated. -const kBannerLocales = [ - "de", - "en", - "es", - "fa", - "fr", - "it", - "nl", - "pl", - "pt", - "ru", - "sv", - "tr", -]; - -// A list of donation page locales (at least redirects should exist). -const kDonationPageLocales = [ - "ar", - "de", - "en", - "es", - "fa", - "fr", - "it", - "ja", - "ko", - "nl", - "pl", - "pt", - "ru", - "tr", - "vi", - "zh", -]; - -const kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; -const gStringBundle = Services.strings.createBundle(kPropertiesURL); - -// Check if we should show the banner, depends on -// browser locale, current date, and how many times -// we have already shown the banner. -const shouldShowBanner = function (shortLocale) { - try { - // If our override test pref is true, then just show the banner regardless. - if (Services.prefs.prefHasUserValue("extensions.torbutton.testBanner") && - Services.prefs.getBoolPref("extensions.torbutton.testBanner") === true) { - return true; - } - // Don't show a banner if update is needed. - let updateNeeded = Services.prefs.getBoolPref("extensions.torbutton.updateNeeded"); - if (updateNeeded) { - return false; - } - // Only show banner when we have that locale and if a donation redirect exists. - if (kBannerLocales.indexOf(shortLocale) === -1 || - kDonationPageLocales.indexOf(shortLocale) === -1) { - return false; - } - // Only show banner between 2017 Oct 23 and 2018 Jan 25. - let now = new Date(); - let start = new Date(2017, 9, 23); - let end = new Date(2018, 0, 26); - let shownCountPref = "extensions.torbutton.donation_banner2017.shown_count"; - if (now < start || now > end) { - // Clean up pref if not in use. - Services.prefs.clearUserPref(shownCountPref); - return false; - } - // Only show banner 50 times. - let count = 0; - if (Services.prefs.prefHasUserValue(shownCountPref)) { - count = Services.prefs.getIntPref(shownCountPref); - } - if (count >= 50) { - return false; - } - Services.prefs.setIntPref(shownCountPref, count+1); - return true; - } catch (e) { - return false; - } -}; - -// Read data needed for displaying banner on page. -var bannerData = function () { - // Read short locale. - let locale = Services.prefs.getCharPref("general.useragent.locale"); - let shortLocale = locale.match(/[a-zA-Z]+/)[0].toLowerCase(); - if (!shouldShowBanner(shortLocale)) { - return null; - } - // Load tag lines. - let taglines = []; - for (let index = 0; index < 5; ++index) { - let tagline = gStringBundle.GetStringFromName( - "aboutTor.donationBanner.tagline" + (index + 1)); - taglines.push(tagline); - } - // Read slogan, mozilla, and donate button text. - let slogan = gStringBundle.GetStringFromName("aboutTor.donationBanner.slogan"); - let mozilla = gStringBundle.GetStringFromName("aboutTor.donationBanner.mozilla"); - let donate = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - return JSON.stringify({ taglines, slogan, mozilla, donate, shortLocale }); -}; - -// Export utility functions for external use. -var EXPORTED_SYMBOLS = ["bannerData"];

1 0

[tor-browser-build/master] Bump rbm to latest master
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit 58dd3596db905fc741e4dc945b26b382180b74b8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 2 07:22:04 2018 +0000 Bump rbm to latest master --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 5c89374..7494edc 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 5c89374df7957238a9565c0b938ee3f30f880438 +Subproject commit 7494edc6d2556c511c213823a6549410ba75f73b

1 0

[rbm/master] Bug 24931: fix the build_log_append option
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit 476391e2c8a808acec3b6c6429dddd9f6280d783 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 18 13:58:20 2018 +0100 Bug 24931: fix the build_log_append option Fix a regression introduced by #24361. --- lib/RBM.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/RBM.pm b/lib/RBM.pm index 73b7d6c..3b19ca9 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -1035,6 +1035,7 @@ sub build_run { if ($build_log ne '-') { my $append = project_config($project, "build_log_append", $options); $build_log = rbm_path($build_log); + unlink $build_log unless $append; make_path(dirname($build_log)); my $now = localtime; path($build_log)->append_utf8("Starting build: $now\n");

1 0

[rbm/master] Merge remote-tracking branch 'boklm/bug_24931'
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit 7494edc6d2556c511c213823a6549410ba75f73b Merge: b83c74c 476391e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 2 07:13:42 2018 +0000 Merge remote-tracking branch 'boklm/bug_24931' lib/RBM.pm | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Bug 25111: Don't compile Yasm on our own anymore for Windows Tor Browser
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit 57f544ca8590b00b609b62132aeb2ae7abfa7779 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 1 13:10:08 2018 +0100 Bug 25111: Don't compile Yasm on our own anymore for Windows Tor Browser --- projects/firefox/build | 4 ---- projects/firefox/config | 3 --- projects/yasm/build | 14 -------------- projects/yasm/config | 12 ------------ 4 files changed, 33 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 81d4d1c..051d573 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -12,10 +12,6 @@ # compiler setup so that mingw is first in the PATH. export LD_LIBRARY_PATH=$hgccdir/lib64 export PATH=$hgccdir/bin:$PATH - - # Firefox ESR52 needs Yasm >= 1.2.0 which Ubuntu Precise does not ship. - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/yasm') %] - export PATH="/var/tmp/dist/yasm/bin:$PATH" [% END -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] diff --git a/projects/firefox/config b/projects/firefox/config index 4157500..f19b8ac 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -94,8 +94,5 @@ input_files: - project: gcc name: gcc enable: '[% c("var/windows") %]' - - project: yasm - name: yasm - enable: '[% c("var/windows") %]' - filename: STL_win64.patch enable: '[% c("var/windows-x86_64") %]' diff --git a/projects/yasm/build b/projects/yasm/build deleted file mode 100644 index c11924c..0000000 --- a/projects/yasm/build +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/yasm') %] -cd /var/tmp/build/yasm-[% c("version") %] -./configure --prefix="$distdir" -make -j[% c("buildconf/num_procs") %] -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/yasm/config b/projects/yasm/config deleted file mode 100644 index 12d009b..0000000 --- a/projects/yasm/config +++ /dev/null @@ -1,12 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 1.2.0 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 - -input_files: - - project: container-image - - URL: 'https://www.tortall.net/projects/yasm/releases/yasm-[% c("version") %].tar.gz' - name: yasm - sha256sum: 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31

1 0

[tor-browser-build/master] Bug 23738: add ansible scripts to deploy fpcentral
by gk＠torproject.org 29 Jan '18

29 Jan '18

commit c9a600cc365993321a5e9fb9db71f5112b65d78c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 4 19:52:55 2017 +0100 Bug 23738: add ansible scripts to deploy fpcentral --- tools/ansible/Makefile | 3 +++ tools/ansible/README | 5 +++++ tools/ansible/ansible-fpcentral.cfg | 2 ++ tools/ansible/fpcentral.yml | 4 ++++ tools/ansible/inventory | 3 +++ tools/ansible/roles/fpcentral/defaults/main.yml | 5 +++++ tools/ansible/roles/fpcentral/tasks/main.yml | 18 ++++++++++++++++++ tools/ansible/roles/fpcentral/templates/fpcentral.wsgi | 14 ++++++++++++++ 8 files changed, 54 insertions(+) diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index eae73b5..608f932 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -1,2 +1,5 @@ ansible-tbb-build: ansible-playbook -i inventory tbb-build.yml + +fpcentral: + ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml diff --git a/tools/ansible/README b/tools/ansible/README index f631b08..6b2e6a4 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -11,3 +11,8 @@ ansible-tbb-build: Deploy changes to the machine used by Tor Browser team members to do some Tor Browser builds. +fpcentral: + Deploy fpcentral to forrestii.torproject.org. To be able to run this + you need to be in the fpcentral tpo ldap group. Your ldap password will + be asked, to sudo to the fpcentral user. + diff --git a/tools/ansible/ansible-fpcentral.cfg b/tools/ansible/ansible-fpcentral.cfg new file mode 100644 index 0000000..2ee3fb4 --- /dev/null +++ b/tools/ansible/ansible-fpcentral.cfg @@ -0,0 +1,2 @@ +[defaults] +allow_world_readable_tmpfiles=True diff --git a/tools/ansible/fpcentral.yml b/tools/ansible/fpcentral.yml new file mode 100644 index 0000000..80421a3 --- /dev/null +++ b/tools/ansible/fpcentral.yml @@ -0,0 +1,4 @@ +--- +- hosts: fpcentral + roles: + - role: fpcentral diff --git a/tools/ansible/inventory b/tools/ansible/inventory index e2597a0..32a5805 100644 --- a/tools/ansible/inventory +++ b/tools/ansible/inventory @@ -1,5 +1,8 @@ build-sunet-a ansible_ssh_user=root ansible_ssh_host=build-sunet-a.torproject.net +fpcentral ansible_become=True ansible_become_method=sudo ansible_become_user=fpcentral ansible_ssh_host=forrestii.torproject.org allow_world_readable_tmpfiles=True [tbb-build] build-sunet-a +[fpcentral] +fpcentral diff --git a/tools/ansible/roles/fpcentral/defaults/main.yml b/tools/ansible/roles/fpcentral/defaults/main.yml new file mode 100644 index 0000000..e43b348 --- /dev/null +++ b/tools/ansible/roles/fpcentral/defaults/main.yml @@ -0,0 +1,5 @@ +--- +fpcentral_git_url: https://git.torproject.org/fpcentral.git +fpcentral_git_commit: fc8fc9113e5ee2f84ce30f0b8051772dd9d75447 +fpcentral_rootdir: /srv/fpcentral.tbb.torproject.org +fpcentral_virtualenv: "{{ fpcentral_rootdir }}/fpcentral-virtualenv" diff --git a/tools/ansible/roles/fpcentral/tasks/main.yml b/tools/ansible/roles/fpcentral/tasks/main.yml new file mode 100644 index 0000000..e5a4d2e --- /dev/null +++ b/tools/ansible/roles/fpcentral/tasks/main.yml @@ -0,0 +1,18 @@ +--- +- name: clone fpcentral git repo + git: repo={{ fpcentral_git_url }} dest={{ fpcentral_rootdir }}/fpcentral + version={{ fpcentral_git_commit }} + +- name: create python3 virtual env + command: "python3 -mvirtualenv -p python3 {{ fpcentral_virtualenv }}" + args: + creates: "{{ fpcentral_virtualenv }}" + +- name: install required python modules + command: "{{ fpcentral_virtualenv }}/bin/pip3 install -r {{ fpcentral_rootdir }}/fpcentral/requirements.txt" + +- template: + src: fpcentral.wsgi + dest: "{{ fpcentral_rootdir }}/fpcentral/fpcentral.wsgi" + mode: 0755 + diff --git a/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi b/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi new file mode 100644 index 0000000..d4d7575 --- /dev/null +++ b/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi @@ -0,0 +1,14 @@ +activate_this = '{{ fpcentral_virtualenv }}/bin/activate_this.py' +with open(activate_this) as file_: + exec(file_.read(), dict(__file__=activate_this)) + +import sys +sys.path.insert(0, '{{ fpcentral_rootdir }}/fpcentral') +import os +os.chdir('{{ fpcentral_rootdir }}/fpcentral') +from run import app as application + +# we include the fpcentral commit as a comment, to make sure the +# fpcentral.wsgi file is modified when the commit is updated, causing +# the process to be restarted: +# {{ fpcentral_git_commit }}

1 0

[fpcentral/master] Bug 25060: set "Accept-Encoding" header expected value assuming we are using https
by boklm＠torproject.org 28 Jan '18

28 Jan '18

commit fc8fc9113e5ee2f84ce30f0b8051772dd9d75447 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Jan 28 22:21:08 2018 +0100 Bug 25060: set "Accept-Encoding" header expected value assuming we are using https --- fingerprint/acceptable/torbrowser70.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fingerprint/acceptable/torbrowser70.json b/fingerprint/acceptable/torbrowser70.json index 0f50c83..1664fe3 100644 --- a/fingerprint/acceptable/torbrowser70.json +++ b/fingerprint/acceptable/torbrowser70.json @@ -32,7 +32,7 @@ "timezone": 0, "cookies": "yes", "platform": "Win32", - "Accept-Encoding": "gzip, deflate", + "Accept-Encoding": "gzip, deflate, br", "Accept-Language": "en-US,en;q=0.5", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Content-Type": "",

1 0

[fpcentral/master] Bug 22587: add support for the automated_test argument
by boklm＠torproject.org 28 Jan '18

28 Jan '18

commit a27e401cc0995cd0205c8e995b0d370167cadf6e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Jan 28 19:53:38 2018 +0100 Bug 22587: add support for the automated_test argument If the /fp URL contains an `automated_test` argument, don't wait for the user to click the buttons to start the tests, but run them directly. This makes it easier to integrate fpcentral into our testsuite. --- static/js/clientAPI.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/static/js/clientAPI.js b/static/js/clientAPI.js index bf10164..498275d 100644 --- a/static/js/clientAPI.js +++ b/static/js/clientAPI.js @@ -178,6 +178,12 @@ $(document).ready(function() { localStorage.removeItem(sendTemp); localStorage.removeItem(statsTemp); } + + if (window.location.search.indexOf("automated_test") > -1) { + api.run(); + api.send(); + api.getNumberFP(); + } });

1 0

[tor-browser-build/master] Bug 23766: Document error during debootstrap
by gk＠torproject.org 26 Jan '18

26 Jan '18

commit 62ee652c588858ded1aa02261510f1c05234795a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 26 07:27:42 2018 +0000 Bug 23766: Document error during debootstrap Patch provided by kkuehl, thanks --- README.BUILD_ERRORS | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS index 0562f93..68333d5 100644 --- a/README.BUILD_ERRORS +++ b/README.BUILD_ERRORS @@ -28,3 +28,30 @@ nopat $ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate' ---- + +Error during debootstrap image creation +--------------------------------------- + +If the debootstrap-image-.log contains errors similar to the following: +W: Failed to fetch http://archive.ubuntu.com/ubuntu/dists/zesty/InRelease + Temporary failure resolving 'archive.ubuntu.com' + +Check /etc/resolv.conf on the host to see if the nameserver is set to +127.0.0.1. This can happen when runc performs a bind mount of +/etc/resolv.conf and the host system is running systemd-resolved. + +sudo systemctl disable systemd-resolved.service +sudo service systemd-resolved stop + +Put the following line in the [main] section of your +/etc/NetworkManager/NetworkManager.conf: + +dns=default + +Delete the symlink /etc/resolv.conf + +rm /etc/resolv.conf + +Restart network-manager + +sudo service network-manager restart

1 0

[torbutton/master] Bug 24159: version check does not deal with platform specific checks
by gk＠torproject.org 25 Jan '18

25 Jan '18

commit f8604998e58fdece9c191661121ada6a3b911499 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jan 23 16:04:11 2018 -0500 Bug 24159: version check does not deal with platform specific checks For known platforms, append "-Windows", "-Linux", "-MacOS", or "-Android" to torbrowser.version before checking against the recommended versions JSON file. This allows for platform differences in the supported version. --- src/chrome/content/torbutton.js | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9abc1c5..7e78ff5 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -752,12 +752,27 @@ function torbutton_do_async_versioncheck() { try { var version_list = JSON.parse(req.responseText); var my_version = m_tb_prefs.getCharPref("torbrowser.version"); - for (var v in version_list) { - if (version_list[v] == my_version) { - torbutton_log(3, "Version check passed."); - m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); - return; - } + var platformSuffix; + var platform = Services.appinfo.OS; + switch (platform) { + case "WINNT": + platformSuffix = "Windows"; + break; + case "Darwin": + platformSuffix = "MacOS"; + break; + case "Linux": + case "Android": + platformSuffix = platform; + break; + } + if (platformSuffix) + my_version += "-" + platformSuffix; + + if (version_list.indexOf(my_version) >= 0) { + torbutton_log(3, "Version check passed."); + m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); + return; } torbutton_log(5, "Your Tor Browser is out of date."); m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, true);

1 0

[rbm/master] Bug 25004: rename abbrev_lenght to abbrev_length
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit b83c74ca4b91732f64011f0255a1594f7747b340 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 24 17:34:49 2018 +0100 Bug 25004: rename abbrev_lenght to abbrev_length --- NEWS | 2 +- doc/options_misc.asc | 4 ++-- lib/RBM/DefaultConfig.pm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index d517840..256cad9 100644 --- a/NEWS +++ b/NEWS @@ -39,7 +39,7 @@ - Add support for external input files, documented in burps_input_files(7) -- Add the abbrev and abbrev_lenght options +- Add the abbrev and abbrev_length options - Add the tar option, to create deterministic tar files diff --git a/doc/options_misc.asc b/doc/options_misc.asc index 3b3b877..876768b 100644 --- a/doc/options_misc.asc +++ b/doc/options_misc.asc @@ -17,8 +17,8 @@ abbrev:: This option returns the abbreviated commit hash of the +git_hash+ or +hg_hash+ commit. -abbrev_lenght:: - This option sets the lenght of the abbreviated commits, when +abbrev_length:: + This option sets the length of the abbreviated commits, when using the +abbrev+ option. tar:: diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index d0d893a..4121264 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -129,10 +129,10 @@ our %default_config = ( build_log_append => '1', notmpl => [ qw(projects_dir) ], describe => \&git_describe, - abbrev_lenght => '12', + abbrev_length => '12', abbrev => '[% IF c("git_url"); - exec("git log -1 --abbrev=" _ c("abbrev_lenght") _ " --format=%h " _ c("git_hash")); + exec("git log -1 --abbrev=" _ c("abbrev_length") _ " --format=%h " _ c("git_hash")); ELSE; exec(c("hg") _ " id -i -r " _ c("hg_hash")); END;

1 0

[rbm/master] Bug 24982: add script to help updating the website
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit 213fad5a8fe04272359c33778626a2802efc4ebc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 23 19:01:13 2018 +0100 Bug 24982: add script to help updating the website This script will create a tarball containing the website and print commands that can be used to upload it. --- doc/make-rbm-docs-tar.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/make-rbm-docs-tar.sh b/doc/make-rbm-docs-tar.sh new file mode 100755 index 0000000..5a1b576 --- /dev/null +++ b/doc/make-rbm-docs-tar.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +docsdir=$(pwd) +tmpdir=$(mktemp -d) +make clean +make install-web webdir="$tmpdir" +cd "$tmpdir" +chmod 664 * +tar -cf "$docsdir"/rbm-docs.tar * +cd - +rm -Rf "$tmpdir" +echo "You can now update the web site with:" +echo " ssh staticiforme.torproject.org tar --overwrite -p -C /srv/rbm-master.torproject.org/htdocs -xf - < rbm-docs.tar" +echo " ssh staticiforme.torproject.org static-update-component rbm.torproject.org"

1 0