- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 18101: Suppress upload file dialog proxy bypass (linux)
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit eb7cb8fe69de4ca08b8aa2ece0faeb7ea6217004 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Sep 20 09:35:38 2017 -0700 Bug 18101: Suppress upload file dialog proxy bypass (linux) --- widget/gtk/nsFilePicker.cpp | 14 +++----------- widget/gtk/nsFilePicker.h | 2 -- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp index 172cb4444849..d1ab963e1012 100644 --- a/widget/gtk/nsFilePicker.cpp +++ b/widget/gtk/nsFilePicker.cpp @@ -170,7 +170,6 @@ NS_IMPL_ISUPPORTS(nsFilePicker, nsIFilePicker) nsFilePicker::nsFilePicker() : mSelectedType(0) , mRunning(false) - , mAllowURLs(false) #if (MOZ_WIDGET_GTK == 3) , mFileChooserDelegate(nullptr) #endif @@ -240,13 +239,6 @@ nsFilePicker::InitNative(nsIWidget *aParent, } NS_IMETHODIMP -nsFilePicker::AppendFilters(int32_t aFilterMask) -{ - mAllowURLs = !!(aFilterMask & filterAllowURLs); - return nsBaseFilePicker::AppendFilters(aFilterMask); -} - -NS_IMETHODIMP nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) { if (aFilter.EqualsLiteral("..apps")) { @@ -402,9 +394,9 @@ nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1); - if (mAllowURLs) { - gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE); - } + + // Don't allow remote URLs. + gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), TRUE); if (action == GTK_FILE_CHOOSER_ACTION_OPEN || action == GTK_FILE_CHOOSER_ACTION_SAVE) { GtkWidget *img_preview = gtk_image_new(); diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h index 2b5042098c65..f7b1bf639bdd 100644 --- a/widget/gtk/nsFilePicker.h +++ b/widget/gtk/nsFilePicker.h @@ -25,7 +25,6 @@ public: // nsIFilePicker (less what's in nsBaseFilePicker) NS_IMETHOD Open(nsIFilePickerShownCallback *aCallback) override; - NS_IMETHOD AppendFilters(int32_t aFilterMask) override; NS_IMETHOD AppendFilter(const nsAString& aTitle, const nsAString& aFilter) override; NS_IMETHOD SetDefaultString(const nsAString& aString) override; @@ -62,7 +61,6 @@ protected: int16_t mSelectedType; int16_t mResult; bool mRunning; - bool mAllowURLs; nsCString mFileURL; nsString mTitle; nsString mDefault;

1 0

[tor-browser-build/master] Bug 23384: Fix ssh key for mcs
by boklm＠torproject.org 21 Sep '17

21 Sep '17

commit 57e3f2513809d98c419b5b30f85326c7250e68b1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 21 17:56:01 2017 +0200 Bug 23384: Fix ssh key for mcs --- tools/ansible/roles/tbb-team/files/mcs.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-team/files/mcs.pub b/tools/ansible/roles/tbb-team/files/mcs.pub index 669c324..af8dd08 100644 --- a/tools/ansible/roles/tbb-team/files/mcs.pub +++ b/tools/ansible/roles/tbb-team/files/mcs.pub @@ -1 +1 @@ -ssh key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDipHBalbwyEb0AWwbRPa+pxGGSyFTkoOtyn76AqTD6WZIJKBBe4PkkqkJOI7STWxwVkbzTZoC1UyzUCXc3L/bxt85bopAgg0EucM3z3t6XX3kbaDPEGi+mhA4lFYdpJmWe1wbDhiAMYSAONnVcRgmk6bPkgRBWM5zCshOOS5/hs1HW6/zOzgJX6+B7vLYiccHkRj9YeOln+OyR+ko1nFovBFIeDw5DjZqNHki0/hBe1SpaBKCUWHBwkugmvI3Q/VL5pQhWAcMwqEmEcosmX5SPBsAn8217u0mPLcW2cAx30Yj95lfO3LzOV27dnqYfT0IN4gysm2S9Z0mV7yMgSkgV mcs +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDipHBalbwyEb0AWwbRPa+pxGGSyFTkoOtyn76AqTD6WZIJKBBe4PkkqkJOI7STWxwVkbzTZoC1UyzUCXc3L/bxt85bopAgg0EucM3z3t6XX3kbaDPEGi+mhA4lFYdpJmWe1wbDhiAMYSAONnVcRgmk6bPkgRBWM5zCshOOS5/hs1HW6/zOzgJX6+B7vLYiccHkRj9YeOln+OyR+ko1nFovBFIeDw5DjZqNHki0/hBe1SpaBKCUWHBwkugmvI3Q/VL5pQhWAcMwqEmEcosmX5SPBsAn8217u0mPLcW2cAx30Yj95lfO3LzOV27dnqYfT0IN4gysm2S9Z0mV7yMgSkgV mcs

1 0

[tor-browser-build/master] Fix typos in Changelog
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit 7de96454f27bd4ceb74f40366a80d18c8a6204aa Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 21 13:37:45 2017 +0000 Fix typos in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a8014c1..f6c37f9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,7 +21,7 @@ Tor Browser 7.5a4 -- August 9 2017 * Bug 22618: Downloading pdf file via file:/// is stalling * Bug 22542: Resize slider window to work without scrollbars * Bug 21999: Fix display of language prompt in non-en-US locales - * Bug 18193: Don't let about:tor have chrome privileges + * Bug 18913: Don't let about:tor have chrome privileges * Bug 22535: Search on about:tor discards search query * Bug 21948: Going back to about:tor page gives "Address isn't valid" error * Code clean-up @@ -63,7 +63,7 @@ Tor Browser 7.0.4 -- August 8 2017 * Update Tor to 0.3.0.10 * Update Torbutton to 1.9.7.5 * Bug 21999: Fix display of language prompt in non-en-US locales - * Bug 18193: Don't let about:tor have chrome privileges + * Bug 18913: Don't let about:tor have chrome privileges * Bug 22535: Search on about:tor discards search query * Bug 21948: Going back to about:tor page gives "Address isn't valid" error * Code clean-up

1 0

[tor-browser-build/master] Fold in missing Changelog for 7.0.4
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit 83fb7125d73a7cc59bca7110b3696893162df202 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 21 13:30:16 2017 +0000 Fold in missing Changelog for 7.0.4 --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 8945e0c..a8014c1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -57,6 +57,33 @@ Tor Browser 7.5a4 -- August 9 2017 * Linux * Bug 20929: Bump GCC version to 5.4.0 +Tor Browser 7.0.4 -- August 8 2017 + * All Platforms + * Update Firefox to 52.3.0esr + * Update Tor to 0.3.0.10 + * Update Torbutton to 1.9.7.5 + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + * Update Tor Launcher to 0.2.12.3 + * Bug 22592: Default bridge settings are not removed + * Translations update + * Update HTTPS-Everywhere to 5.2.21 + * Update NoScript to 5.0.8.1 + * Bug 22362: Remove workaround for XSS related browser freezing + * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Bug 21321: Exempt .onions from HTTP related security warnings + * Bug 22073: Disable GetAddons option on addons page + * Bug 22884: Fix broken about:tor page on higher security levels + * Windows + * Bug 22829: Remove default obfs4 bridge riemann. + * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr) + * OS X + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.5a3 -- July 28 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit 2702798326d8e374d857110558cd0bfc3ad4f028 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 21 13:19:19 2017 +0000 Translations update --- src/chrome/locale/am/network-settings.dtd | 6 ++--- src/chrome/locale/am/torlauncher.properties | 8 +++---- src/chrome/locale/be/torlauncher.properties | 6 ++--- src/chrome/locale/fr/network-settings.dtd | 6 ++--- src/chrome/locale/fr/torlauncher.properties | 2 +- src/chrome/locale/is/network-settings.dtd | 36 ++++++++++++++--------------- src/chrome/locale/is/torlauncher.properties | 16 ++++++------- src/chrome/locale/it/progress.dtd | 2 +- src/chrome/locale/kk/torlauncher.properties | 2 +- src/chrome/locale/ko/network-settings.dtd | 2 +- src/chrome/locale/ky/network-settings.dtd | 6 ++--- src/chrome/locale/ky/torlauncher.properties | 4 ++-- src/chrome/locale/my/network-settings.dtd | 2 +- src/chrome/locale/my/torlauncher.properties | 4 ++-- src/chrome/locale/ru/torlauncher.properties | 6 ++--- src/chrome/locale/tr/network-settings.dtd | 6 ++--- src/chrome/locale/tr/torlauncher.properties | 4 ++-- 17 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd index 0d2e9dc..2e81470 100644 --- a/src/chrome/locale/am/network-settings.dtd +++ b/src/chrome/locale/am/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "አዎ"> +<!ENTITY torSettings.no "አይደለም "> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> @@ -17,7 +17,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "አገናኝ"> <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties index ab9e562..7ec7730 100644 --- a/src/chrome/locale/am/torlauncher.properties +++ b/src/chrome/locale/am/torlauncher.properties @@ -30,11 +30,11 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(የሚመከር) -torlauncher.connect=Connect +torlauncher.connect=አገናኝ torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.quit=አቋርጥ +torlauncher.quit_win=ቅጣ +torlauncher.done=ተሰርቷል torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties index 786b061..a1926d6 100644 --- a/src/chrome/locale/be/torlauncher.properties +++ b/src/chrome/locale/be/torlauncher.properties @@ -32,9 +32,9 @@ torlauncher.recommended_bridge=(recommended) torlauncher.connect=Злучэнне torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.quit=Выхад +torlauncher.quit_win=Выйсце +torlauncher.done=Зроблена torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 5aae7f3..d795967 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -11,7 +11,7 @@ <!ENTITY torSettings.yes "Oui"> <!ENTITY torSettings.no "Non"> -<!ENTITY torSettings.firstQuestion "Laquelle des suivantes décrit le mieux votre situation ?javascript:;"> +<!ENTITY torSettings.firstQuestion "Laquelle des suivantes décrit le mieux votre situation ?"> <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> <!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont (Bridge) ou un mandataire local avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> @@ -20,13 +20,13 @@ <!ENTITY torSettings.connect "Se connecter"> <!ENTITY torSettings.proxyPageTitle "Configuration du mandataire local"> -<!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accéder à Internet ?"> +<!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accéder à Internet ?">  <!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n'est pas requis, mais il pourrait être exigé pour une connexion par un réseau d'entreprise, d'école ou d'université."> <!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d'un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> <!ENTITY torSettings.bridgePageTitle "Configuration des ponts (Bridges) Tor"> -<!ENTITY torSettings.bridgeQuestion "Votre fournisseur d'accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor ?"> +<!ENTITY torSettings.bridgeQuestion "Votre fournisseur d'accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor ?"> <!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont (Bridge), vous pourrez en ajouter un ultérieurement)."> <!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandé de configurer des ponts (Bridges) Tor, qui sont des relais non répertoriés et qui rendent plus difficile le blocage du réseau Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts (Bridges) fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 93b11a8..8a5f37f 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -50,7 +50,7 @@ torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor torlauncher.bootstrapStatus.handshake_or=Mise en place d'un circuit Tor -torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor ! +torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor ! torlauncher.bootstrapWarning.done=effectué torlauncher.bootstrapWarning.connectrefused=connexion refusée diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index bc5f007..1e294fd 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -6,27 +6,27 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Áður en þú tengist Tor-netinu, verðurðu að gefa upplýsingar um Internet-tengingu tölvunnar."> <!ENTITY torSettings.yes "Já"> <!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Hvað af eftirfarandi lýsir best aðstæðum þínum?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt1 "Internet-tenging þessarar tölvu er ritskoðuð eða beint í gegnum milliþjón."> +<!ENTITY torSettings.configurePrompt2 "Setja verður upp Tor-brú eða stilla staðværan milliþjón (proxy) áður en tengst er við Tor netið."> <!ENTITY torSettings.configure "Stilla"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Ég myndi vilja koma á beinni tengingu við Tor-netið."> <!ENTITY torSettings.connectPrompt3 "Þetta mun virka í flestum tilfellum."> <!ENTITY torSettings.connect "Tengjast"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyPageTitle "Uppsetning á staðværum milliþjóni (local proxy)"> +<!ENTITY torSettings.proxyQuestion "Þarf þessi tölva staðværan milliþjón (local proxy) til að fá aðgang að Internetinu?">  <!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> <!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.enterProxy "Settu inn stillingar milliþjónsins."> +<!ENTITY torSettings.bridgePageTitle "Uppsetning Tor-brúa"> +<!ENTITY torSettings.bridgeQuestion "Hindrar eða ritskoðar netþjónustuaðilinn þinn (ISP) á einhvern hátt tengingar inn á Tor-netið?"> <!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> <!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> @@ -35,14 +35,14 @@ <!ENTITY torsettings.startingTor "Bíð eftir að Tor ræsist..."> <!ENTITY torsettings.restartTor "Endurræsa Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Endurstilla"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Fjarlægja stillingar og tengjast"> <!ENTITY torsettings.optional "Valkvætt"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Þessi tölva þarf staðværan milliþjón (local proxy) til að fá aðgang að Internetinu"> <!ENTITY torsettings.useProxy.type "Gerð milliþjóns:"> <!ENTITY torsettings.useProxy.address "Vistfang:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-vistfang eða vélarheiti"> @@ -55,15 +55,15 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Leyfðar gáttir:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.default "Tengjast með tiltækum brúm"> <!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> <!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.custom "Settu inn sérsniðnar brýr"> +<!ENTITY torsettings.useBridges.label "Settu inn einn eða fleiri endurvarpa fyrir brýr (einn á hverja línu)."> <!ENTITY torsettings.useBridges.placeholder "settu inn vistfang:gátt"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.copyLog "Afrita atvikaskrá Tor á klippispjald"> +<!ENTITY torsettings.bridgeHelpTitle "Hjálp fyrir brúaendurvarpa"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Í gegnum vefinn"> @@ -71,5 +71,5 @@ <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4Heading "Í gegnum hjálparborðið"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index c2ac7ef..5ac6c53 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -7,20 +7,20 @@ torlauncher.tor_exited_during_startup=Tor exited during startup. This might be d torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_failed_to_start=Tor ræstist ekki. +torlauncher.tor_control_failed=Mistókst að ná stjórn yfir Tor. torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. torlauncher.tor_bootstrap_failed_details=%1$S mistókst (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. +torlauncher.unable_to_start_tor=Tókst ekki að ræsa Tor.\n\n%S +torlauncher.tor_missing=Vantar Tor-keyrsluskrána. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.password_hash_missing=Mistókst að fá hakkað lykilorð. -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Tókst ekki að nálgast stillingar fyrir Tor.\n\n%S +torlauncher.failed_to_save_settings=Tókst ekki að vista stillingar fyrir Tor.\n\n%S +torlauncher.ensure_tor_is_running=Gakktu úr skugga um að Tor sé keyrandi. torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. torlauncher.error_proxy_type_missing=Þú verður að velja tegund milliþjóns. diff --git a/src/chrome/locale/it/progress.dtd b/src/chrome/locale/it/progress.dtd index cf758aa..e60f306 100644 --- a/src/chrome/locale/it/progress.dtd +++ b/src/chrome/locale/it/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stato di Tor"> <!ENTITY torprogress.openSettings "Apertura impostazioni"> <!ENTITY torprogress.heading "Connessione in corso alla rete Tor"> -<!ENTITY torprogress.pleaseWait "Perfavore attendi finche non viene stabilita una connessione alla rete Tor.  Potrebbe richiedere alcuni minuti."> +<!ENTITY torprogress.pleaseWait "Per favore attendere finchè non verrà stabilita una connessione alla rete Tor.  Potrebbero essere necessari alcuni minuti."> diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties index 24bb4d6..e3a225b 100644 --- a/src/chrome/locale/kk/torlauncher.properties +++ b/src/chrome/locale/kk/torlauncher.properties @@ -32,7 +32,7 @@ torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.quit=Жұмысын аяқтау torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index ab7f905..8599b02 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "어떤 것이 귀하의 상황에 가깝습니까?"> <!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열되어 있거나 프록시를 통합니다."> -<!ENTITY torSettings.configurePrompt2 "Tor 네트워크에 연결하기 전에 브리지 또는 로컬 프록시 설정을 구성 해야 합니다."> +<!ENTITY torSettings.configurePrompt2 "Tor 네트워크에 연결하기 전에 브리지 또는 로컬 프록시 설정을 구성해야 합니다."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> <!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작합니다"> diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index 5349f81..74be4e1 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Ооба"> +<!ENTITY torSettings.no "Жок"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> @@ -17,7 +17,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "Байланышуу "> <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties index 10aa48b..7de69b9 100644 --- a/src/chrome/locale/ky/torlauncher.properties +++ b/src/chrome/locale/ky/torlauncher.properties @@ -30,11 +30,11 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) -torlauncher.connect=Connect +torlauncher.connect=Байланышуу torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Чыгуу -torlauncher.done=Done +torlauncher.done=Даяр torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd index 94deb90..8f58545 100644 --- a/src/chrome/locale/my/network-settings.dtd +++ b/src/chrome/locale/my/network-settings.dtd @@ -17,7 +17,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "ချိတ်ဆက်ရန်"> <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties index ffb6021..eef9cb1 100644 --- a/src/chrome/locale/my/torlauncher.properties +++ b/src/chrome/locale/my/torlauncher.properties @@ -30,11 +30,11 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(အကြံပြုထားသည်) -torlauncher.connect=Connect +torlauncher.connect=ချိတ်ဆက်ရန် torlauncher.restart_tor=Restart Tor torlauncher.quit=ထွက်ရန် torlauncher.quit_win=ထွက်ရန် -torlauncher.done=Done +torlauncher.done=ပြီးပါပြီ torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index aabbcaf..442f81b 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -16,10 +16,10 @@ torlauncher.unable_to_start_tor=Невозможно запустить Tor.\n\n torlauncher.tor_missing=Исполняемый файл Tor отсутствует. torlauncher.torrc_missing=torrc файл отсутствует и не может быть создан. torlauncher.datadir_missing=Директория данных Tor не существует и не может быть создана. -torlauncher.password_hash_missing=Не удаётся получить хэшированный пароль. +torlauncher.password_hash_missing=Не удается получить хэшированный пароль. -torlauncher.failed_to_get_settings=Не удаётся загрузить настройки Tor.\n\n%S -torlauncher.failed_to_save_settings=Не удаётся сохранить настройки Tor.\n\n%S +torlauncher.failed_to_get_settings=Не удается загрузить настройки Tor.\n\n%S +torlauncher.failed_to_save_settings=Не удается сохранить настройки Tor.\n\n%S torlauncher.ensure_tor_is_running=Убедитесь, что Tor запущен. torlauncher.error_proxy_addr_missing=Вы должны указать IP-адрес или имя хоста и порт, чтобы настроить Tor и использовать прокси для доступа в Интернет. diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 48ead46..2d99d30 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -29,7 +29,7 @@ <!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına olan bağlantıları engelliyor ya da sansürlüyor mu?"> <!ENTITY torSettings.bridgeExplanation1 "Bu sorunun yanıtından emin değilseniz, Hayır seçin (bir köprü olmadan Tor ağına bağlanamıyorsanız, daha sonra ekleyebilirsiniz)."> <!ENTITY torSettings.bridgeExplanation2 "Evet olarak seçerseniz, Tor Ağı bağlantılarını engellemeyi zorlaştıran listelenmemiş aktarıcılar olan Tor Köprülerini ayarlamanız istenir."> -<!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprüleri kullanabilir ya da özel köprüler edinip yazabilirsiniz."> +<!ENTITY torSettings.bridgeSettingsPrompt "Hazır köprüleri kullanabilir ya da özel köprüler edinip yazabilirsiniz.">  @@ -55,7 +55,7 @@ <!ENTITY torsettings.firewall.checkbox "Bu bilgisayar yalnız belirli bağlantı noktalarına bağlanmaya izin veren bir güvenlik duvarı kullanıyor"> <!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Bağlantı Noktaları:"> <!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (ISS) Tor ağına olan bağlantıları engelliyor"> -<!ENTITY torsettings.useBridges.default "Sağlanan köprüler ile bağlan"> +<!ENTITY torsettings.useBridges.default "Hazır köprüler ile bağlan"> <!ENTITY torsettings.useBridges.note "Her bir köprü türünde engellemeyi aşmak için farklı yöntemler kullanılır.  Bir köprü çalışmazsa farklı bir tanesini deneyin."> <!ENTITY torsettings.useBridges.type "Aktarım tür:"> <!ENTITY torsettings.useBridges.custom "Özel köprüler yazın"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> <!ENTITY torsettings.bridgeHelpTitle "Köprü Aktarıcı Yardımı"> <!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, kullandığınız İnternet Servis Sağlayıcısı (ISS) ya da başka bir kurum Tor 'u engelliyor olabilir. Bu sorunu çoğunlukla, engellenmesi daha zor olan listelenmeyen aktarıcılar, Tor Köprülerini kullanarak çözebilirsiniz."> -<!ENTITY torsettings.bridgeHelp1B "Önceden ayarlanmış, sunulan köprü adreslerini kullanabilir ya da şu üç yöntemden biriyle özel adresler edinebilirsiniz:"> +<!ENTITY torsettings.bridgeHelp1B "Önceden ayarlanmış hazır köprü adreslerini kullanabilir ya da şu üç yöntemden biriyle özel adresler edinebilirsiniz:"> <!ENTITY torsettings.bridgeHelp2Heading "Web yoluyla"> <!ENTITY torsettings.bridgeHelp2 "Bir web tarayıcısı kullanarak https://bridges.torproject.org adresini ziyaret edin"> <!ENTITY torsettings.bridgeHelp3Heading "Otomatik e-posta yanıtı yoluyla"> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index d0f43b2..e2a343d 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -25,8 +25,8 @@ torlauncher.ensure_tor_is_running=Lütfen Tor'un çalıştığından emin olun. torlauncher.error_proxy_addr_missing=İnternet'e bir vekil sunucu üzerinden bağlanmak için bir IP adresi ya da sunucu adı ile bağlantı noktası numarasının yazılması gereklidir. torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. torlauncher.error_bridges_missing=Bir ya da birkaç köprü belirtmelisiniz. -torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım türü seçmelisiniz. -torlauncher.error_bridge_bad_default_type=Sağlanan köprüler %S aktarım türü için kullanılamıyor. Lütfen ayarlarınızı değiştirin. +torlauncher.error_default_bridges_type_missing=Hazır köprüler için bir aktarım türü seçmelisiniz. +torlauncher.error_bridge_bad_default_type=Hazır köprüler %S aktarım türü için kullanılamıyor. Lütfen ayarlarınızı değiştirin. torlauncher.recommended_bridge=(önerilir)

1 0

[tor-browser-build/master] Bug 23384: Add user mcs on build-sunet-a.torproject.net
by boklm＠torproject.org 21 Sep '17

21 Sep '17

commit 99894080a6fd28f95666422877038a69c8df5433 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 21 13:07:30 2017 +0200 Bug 23384: Add user mcs on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/mcs.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 475acca..fff2def 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -2,3 +2,4 @@ tbb_team_members: - boklm - gk + - mcs diff --git a/tools/ansible/roles/tbb-team/files/mcs.pub b/tools/ansible/roles/tbb-team/files/mcs.pub new file mode 100644 index 0000000..669c324 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/mcs.pub @@ -0,0 +1 @@ +ssh key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDipHBalbwyEb0AWwbRPa+pxGGSyFTkoOtyn76AqTD6WZIJKBBe4PkkqkJOI7STWxwVkbzTZoC1UyzUCXc3L/bxt85bopAgg0EucM3z3t6XX3kbaDPEGi+mhA4lFYdpJmWe1wbDhiAMYSAONnVcRgmk6bPkgRBWM5zCshOOS5/hs1HW6/zOzgJX6+B7vLYiccHkRj9YeOln+OyR+ko1nFovBFIeDw5DjZqNHki0/hBe1SpaBKCUWHBwkugmvI3Q/VL5pQhWAcMwqEmEcosmX5SPBsAn8217u0mPLcW2cAx30Yj95lfO3LzOV27dnqYfT0IN4gysm2S9Z0mV7yMgSkgV mcs

1 0

[tor-browser-build/master] Bug 23396: Updating the msvcr100.dll we ship
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit 05f2d5bfb41c901d2d2b7543777e7b0d85121456 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 18 13:04:26 2017 +0000 Bug 23396: Updating the msvcr100.dll we ship We update the location to get the .dll as well taking Mike out of the browser loop. --- projects/firefox/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 034d40f..6babb7d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -81,8 +81,8 @@ input_files: enable: '[% c("var/linux") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - - URL: https://people.torproject.org/~mikeperry/mirrors/sources/msvcr100.dll - sha256sum: 1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 + - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll + sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows") %]' - project: gcc name: gcc

1 0

[tor-browser-build/master] Updating rbm due to bug 23557
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit a27578e6fd0daf2f2133c6e179d968417bc3547d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 21 08:34:26 2017 +0000 Updating rbm due to bug 23557 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 78d9b11..236fcaa 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 78d9b11aead5ba9b2386f7ebb2003772823fa293 +Subproject commit 236fcaac2012531330f21d2e9cce49a534a03b60

1 0

[rbm/master] Bug 23557: download again an input file not matching expected sha256sum
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit 236fcaac2012531330f21d2e9cce49a534a03b60 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 18 17:38:13 2017 +0200 Bug 23557: download again an input file not matching expected sha256sum When an input file is already present (downloaded during a previous build), but is not matching the expected sha256sum, we download it again. To do that we rename the input_file_id_need_dl function to input_file_need_dl, and make it work for all types of actions (instead of only 'input_files_id' before). In input_file_need_dl we ignore an the file if it is not matching the expected sha256sum. --- doc/rbm_input_files.asc | 7 +++++-- lib/RBM.pm | 35 ++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/doc/rbm_input_files.asc b/doc/rbm_input_files.asc index e24d349..2716b23 100644 --- a/doc/rbm_input_files.asc +++ b/doc/rbm_input_files.asc @@ -85,8 +85,11 @@ enable:: refresh_input:: By default, if the file is already present, it is not downloaded - or created again. If this option is set to a true value, the - file will be removed and created again on each run. + or created again, except when an sha256sum is defined and the + file present is not matching. If this option is set to a true + value, the file will be removed and created again on each run, + except when an sha256sum is defined and the file present is + matching. sha256sum:: The sha256 checksum of the file. The build will fail with an diff --git a/lib/RBM.pm b/lib/RBM.pm index 96a1b9b..7850817 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -699,17 +699,25 @@ sub file_in_dir { return map { -e "$_/$filename" ? "$_/$filename" : () } @dir; } -sub input_file_id_need_dl { - my ($input_file, $t, $fname) = @_; - return undef if $input_file->{input_file_id}; - return undef if $input_file->{sha256sum}; - return undef if $input_file->{exec}; - return undef if $fname; - return 1 if $input_file->{URL}; - return 1 if $input_file->{content}; - return undef if $input_file->{project}; - return undef; - exit_error "Missing file" unless $fname; +sub input_file_need_dl { + my ($input_file, $t, $fname, $action) = @_; + return undef if $action eq 'getfpaths'; + if ($fname + && $input_file->{sha256sum} + && $t->('sha256sum') ne sha256_hex(read_file($fname))) { + $fname = undef; + } + if ($action eq 'input_files_id') { + return undef if $input_file->{input_file_id}; + return undef if $input_file->{sha256sum}; + return undef if $input_file->{exec}; + return undef if $fname; + return 1 if $input_file->{URL}; + return 1 if $input_file->{content}; + return undef; + } + return $t->('refresh_input') if $fname; + return 1; } sub input_file_id_hash { @@ -751,7 +759,6 @@ sub input_files { my %res_getfnames; my @res_getfpaths; my $getfnames_noname = 0; - my $need_dl = $action ne 'getfpaths'; my $input_files_id = ''; $options = {$options ? %$options : ()}; my $input_files = project_config($project, 'input_files', $options); @@ -829,10 +836,8 @@ sub input_files { if $input_file->{project}; exit_error("Missing filename:\n" . pp($input_file)) unless $name; my ($fname) = file_in_dir($name, $src_dir, $proj_out_dir); - $need_dl = input_file_id_need_dl($input_file, $t, $fname) - if $action eq 'input_files_id'; my $file_gpg_id = gpg_id($t->('file_gpg_id')); - if ($need_dl && (!$fname || $t->('refresh_input'))) { + if (input_file_need_dl($input_file, $t, $fname, $action)) { if ($t->('content')) { write_file("$proj_out_dir/$name", $t->('content')); } elsif ($t->('URL')) {

1 0

[tor-browser-bundle/maint-7.0] There is the torbutton key as well...
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit 4bd6009419433fcb758cb79b6e9c5a3086da89ba Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 20 13:58:47 2017 +0000 There is the torbutton key as well... --- gitian/gpg/torbutton.gpg | Bin 135369 -> 182747 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index 17b6c70..8a087c0 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/maint-7.0] Updating gk's subkeys
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit 787fb6cd2b7fd50bbe8a8089ba24d6827aa5697e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 20 13:47:43 2017 +0000 Updating gk's subkeys --- gitian/gpg/gk.gpg | Bin 41255 -> 88633 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index 9037e43..2eb314e 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

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

20 Sep '17

commit 9531065790b09471d9deb66dad59fcc44bdd6db3 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 20 13:18:52 2017 +0000 Release preparations for 7.0.6 Changelog update, versions bump, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ gitian/versions | 14 +++++++------- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index aace374..310cdf0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,17 @@ +Tor Browser 7.0.6 -- September 26 2017 + * All Platforms + * Update Firefox to 52.4.0esr + * Update Tor to 0.3.1.7 + * Update Torbutton to 1.9.7.7 + * Bug 22542: Security Settings window too small on macOS 10.12 (fixup) + * Bug 20375: Warn users after entering fullscreen mode + * Update HTTPS-Everywhere to 2017.9.12 + * Update NoScript to 5.0.10 + * Bug 21830: Copying large text from web console leaks to /tmp + * Bug 23393: Don't crash all tabs when closing one tab + * OS X + * Bug 23404: Add missing Noto Sans Buginese font to the macOS whitelist + Tor Browser 7.0.5 -- September 4 2017 * All Platforms * Update Torbutton to 1.9.7.6 diff --git a/gitian/versions b/gitian/versions index d6e1dd4..368fb98 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.3.0esr +FIREFOX_VERSION=52.4.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 -TOR_TAG=tor-0.3.0.10 +TOR_TAG=tor-0.3.1.7 TORLAUNCHER_TAG=0.2.12.3 -TORBUTTON_TAG=1.9.7.6 -HTTPSE_TAG=2017.8.31 +TORBUTTON_TAG=1.9.7.7 +HTTPSE_TAG=2017.9.12 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -45,7 +45,7 @@ GITIAN_TAG=tor-browser-builder-4-5 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.0.9-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.10-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=610dc5ffcc7133f2ccc2f1a14280e326d371a8a2fc76497becf2d5cf21257955 +NOSCRIPT_HASH=cfc8018a5ddd2a699581932a9911e28b1060667c7849cf5283b548b5b29a65a2 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index dbd4551..9838c8a 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.5 + release: 7.0.6 versions: - 7.0.5: - platformVersion: 52.3.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-705-released + 7.0.6: + platformVersion: 52.4.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-706-released incremental_from: - - 7.0.4 + - 7.0.5 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] squash! Bug 6253: Add canvas image extraction prompt.
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit 852e4a1ef17e19ea5f57072f1ea3779107e7dce2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 20 09:26:21 2017 -0400 squash! Bug 6253: Add canvas image extraction prompt. When processing the ShowCanvasPermissionPrompt message in the main (parent) process, avoid returning an error from the IPC handler if the browser element cannot be obtained. Prior to this change, canvas prompt requests that arrived as a tab was closing would generate an error, which in turn caused the main process to kill the content process. --- dom/ipc/TabParent.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index ff1b41afafdb..9731561ce0b3 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -3281,7 +3281,12 @@ bool TabParent::RecvShowCanvasPermissionPrompt(const nsCString& firstPartyURI) { nsCOMPtr<nsIBrowser> browser = do_QueryInterface(mFrameElement); - NS_ENSURE_TRUE(browser, false); + if (!browser) { + // If the tab is being closed, the browser may not be available. + // In this case we can ignore the request. + return true; + } + nsCOMPtr<nsIObserverService> os = services::GetObserverService(); NS_ENSURE_TRUE(os, false); nsresult rv = os->NotifyObservers(browser, "canvas-permissions-prompt",

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 1365047 Turn on the Windows DLL Blocklist in MinGW r=aklotz
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit 1eeaa470e06b7538a961b2f33dddaeafdcc456fd Author: Tom Ritter <tom(a)mozilla.com> Date: Mon May 15 15:49:20 2017 -0500 Bug 1365047 Turn on the Windows DLL Blocklist in MinGW r=aklotz MozReview-Commit-ID: 3hF7iOdH89P --HG-- extra : rebase_source : 95614960544ae55b983dbbd40e1036ff236204b3 --- mozglue/build/WindowsDllBlocklist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozglue/build/WindowsDllBlocklist.h b/mozglue/build/WindowsDllBlocklist.h index 5afe6b8ceee8..82d4a365351f 100644 --- a/mozglue/build/WindowsDllBlocklist.h +++ b/mozglue/build/WindowsDllBlocklist.h @@ -6,7 +6,7 @@ #ifndef mozilla_windowsdllblocklist_h #define mozilla_windowsdllblocklist_h -#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) +#if (defined(_MSC_VER) || defined(__MINGW32__)) && (defined(_M_IX86) || defined(_M_X64)) #include <windows.h> #include "mozilla/GuardObjects.h"

1 0

[torbutton/maint-1.9.7] Release preparations for 1.9.7.7
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit 3f8bb67a052a51f8e11d4acb8f105b48fd521b92 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 20 06:45:58 2017 +0000 Release preparations for 1.9.7.7 CHANGELOG update and version bump --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 9a6a53a..35f198c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.7.7 + * Bug 22542: Security Settings window too small on macOS 10.12 (fixup) + * Bug 20375: Warn users after entering fullscreen mode + 1.9.7.6 * Bug 22989: Fix dimensions of new windows on macOS * Translations update diff --git a/src/install.rdf b/src/install.rdf index 4549bda..97cdfd7 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.6</em:version> + <em:version>1.9.7.7</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[torbutton/maint-1.9.7] fixup! Bug 22542: Security Settings window too small on macOS 10.12
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit 9aa6f29c896be65a4f883dd4bd73f48e07d359a7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 12 13:52:28 2017 -0400 fixup! Bug 22542: Security Settings window too small on macOS 10.12 Automatically adjust the height of the Security Settings window so that no scrollbar is needed. Also, add 100 pixels to the width and increase maxheight and maxwidth to give users more flexibility when they choose to manually resize the window. --- src/chrome/content/preferences.js | 46 ++++++++++++++++++++++++++++++++++---- src/chrome/content/preferences.xul | 10 ++++----- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1e47cad..a76dddb 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -42,10 +42,7 @@ function torbutton_init_security_ui() { getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); - // Show a scrollbar for the description text if one is needed. - // To avoid bug 21330, we set the overflow=auto style here instead - // of directly in the XUL. - document.getElementById("descBox").style.overflow = "auto"; + setTimeout(adjustDialogSize, 0); }; // Write the two prefs from the current settings. @@ -54,3 +51,44 @@ function torbutton_save_security_settings() { sliderPositionToPrefSetting(state.slider)); setBoolPref("extensions.torbutton.security_custom", state.custom); }; + +// Increase the height of this window so that a vertical scrollbar is not +// needed on the description box. +function adjustDialogSize() { + try { + // Find the height required by the tallest description element. + let descHeight = 0; + let descs = descNames.map(name => document.getElementById(name)); + descs.forEach(elem => { + let origCollapsed = elem.collapsed; + elem.collapsed = false; + let h = elem.scrollHeight; + elem.collapsed = origCollapsed; + if (h > descHeight) + descHeight = h; + }); + + // Cap the height (just in case). + const kMaxDescriptionHeight = 550; + if (descHeight > kMaxDescriptionHeight) + descHeight = kMaxDescriptionHeight; + + // Increase the height of the description container if it is too short. + let boxElem = document.getElementById("descBox"); + if (boxElem.clientHeight < descHeight) { + boxElem.setAttribute("height", descHeight); + + // Resize the XUL window to account for the new description height. In + // order for sizeToContent() to work correctly, it seems that we must + // remove the height attribute from the dialog (that attribute is added + // after a user manually resizes the window). + document.documentElement.removeAttribute("height"); + sizeToContent(); + } + } catch (e) {} + + // Show a scrollbar for the description text if one is needed. + // To avoid bug 21330, we set the overflow=auto style here instead + // of directly in the XUL. + document.getElementById("descBox").style.overflow = "auto"; +} diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 9bd8ae3..9ebc5d6 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -13,11 +13,11 @@ onload="torbutton_init_security_ui()" align="stretch" pack="center" - maxheight="350" + maxheight="600" minwidth="400" - maxwidth="600" + maxwidth="800" ondialogaccept="torbutton_save_security_settings()" - width="400" > + width="500" > <script type="application/x-javascript" src="torbutton_util.js"/> <script type="application/x-javascript" src="preferences.js"/> @@ -26,7 +26,7 @@ <caption label="&torbutton.prefs.sec_caption;"/> <hbox id="torbutton_slider_settings" flex="1" align="stretch" hidden="false"> <vbox> - <hbox height="220"> + <hbox flex="1" minheight="220"> <vbox> <scale id="torbutton_sec_slider" flex="1" min="1" max="3" movetoclick="true" orient="vertical" @@ -57,7 +57,7 @@ </vbox> </hbox> </vbox> - <vbox id="descBox" flex="1" width="400" style="overflow: hidden;"> + <vbox id="descBox" flex="1" style="overflow: hidden;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0

[torbutton/maint-1.9.7] Bug 20375: Warn users after entering fullscreen mode.
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit d68d2b68366af9456adf8c152e127ec5c10344c5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Aug 22 12:06:21 2017 -0700 Bug 20375: Warn users after entering fullscreen mode. When the browser window is maximized, we show users a notification warning that maximizing the screen is fingerprintable. We should show this warning when the window enters fullscreen mode as well. This change is especially important for macOS, which uses window.STATE_FULLSCREEN instead of window.STATE_MAXIMIZED when the user clicks the "maximize" button on the window title bar. --- src/chrome/content/torbutton.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 11f4b61..db6b694 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2126,7 +2126,8 @@ var torbutton_resizelistener = m_tb_resize_handler = async function() { // Wait for end of execution queue to ensure we have correct windowState. await new Promise(resolve => setTimeout(resolve, 0)); - if (window.windowState === 1) { + if (window.windowState === window.STATE_MAXIMIZED || + window.windowState === window.STATE_FULLSCREEN) { if (m_tb_prefs. getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) {

1 0

[tor-browser/tor-browser-52.3.0esr-7.0-1] Bug 21830: Copying large text from web console leaks to /tmp
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit 7a1b25245e73051cb724a7eb6a66de18263f88c2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 05:55:49 2017 +0000 Bug 21830: Copying large text from web console leaks to /tmp Patch written by Neill Miller --- widget/nsTransferable.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/widget/nsTransferable.cpp b/widget/nsTransferable.cpp index e99d45401df8..976180c7581e 100644 --- a/widget/nsTransferable.cpp +++ b/widget/nsTransferable.cpp @@ -39,6 +39,7 @@ Notes to self: #include "nsIFile.h" #include "nsILoadContext.h" #include "mozilla/UniquePtr.h" +#include "mozilla/Preferences.h" NS_IMPL_ISUPPORTS(nsTransferable, nsITransferable) @@ -248,6 +249,11 @@ nsTransferable::Init(nsILoadContext* aContext) if (aContext) { mPrivateData = aContext->UsePrivateBrowsing(); + } else { + // without aContext here to provide PrivateBrowsing information, + // we defer to the active configured setting + mPrivateData = + mozilla::Preferences::GetBool("browser.privatebrowsing.autostart"); } #ifdef DEBUG mInitialized = true;

1 0

[tor-browser-build/master] Bug 23039: fix detection of runc version
by gk＠torproject.org 19 Sep '17

19 Sep '17

commit 1f054c59ddc349cf5719447bc51eaccde554312a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 19 13:28:34 2017 +0200 Bug 23039: fix detection of runc version In the previous patch, we wrongly assumed that all runc 0.1.1 versions exited with 0 when given an unknown command, and used that to detect the version. It seems it is not true on all systems. We are now using the 'runc --version' command to find the version of runc. We don't support versions older than 0.1.1. --- rbm.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rbm.conf b/rbm.conf index ef37575..a93fa1a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -375,11 +375,10 @@ ENV: ( var_p => { # runc100 is true if we are using runc >= 1.0.0 + # we assume that any version that is not 0.1.1 is >= 1.0.0 runc100 => sub { - # runc >= 1.0.0 exits with an error when trying to use an unknown - # command while older versions exit with 0 - my (undef, undef, $success) = capture_exec('sudo', 'runc', 'xyzxyzxyz'); - return !$success; + my ($out) = capture_exec('sudo', 'runc', '--version'); + return !($out =~ m/^runc version 0.1.1/); }, }, )

1 0

[tor-browser-build/master] Bug 23039: add support for runc 1.0.0
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 209818fc10ba14e8ebfb126cc364c26300795af9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 14 19:08:14 2017 +0200 Bug 23039: add support for runc 1.0.0 The var_p/runc100 option is used to detect the version of runc we are using. The format of the output of `runc --version` is different in both versions, so it is not easy to parse. However I noticed that runc 0.1.1 does not exit with an error when we try to use a command that does not exist while runc >= 1.0.0 does, so we use that to detect the runc version we are using. When using runc >= 1.0.0, we use `runc run` instead of `runc start': https://github.com/opencontainers/runc/commit/c669b8d1568633c68bd915561ceb2… In the runc config.json file, the format of the capabilities has been changed. Instead of having one list of capabilities, there are now separate lists for bounding, effective, inheritable, permitted and ambient capabilities (and we use the same list for all of them): https://github.com/opencontainers/runtime-spec/commit/eb114f057094dd2314682… We also add /proc/timer_list and /sys/firmware to the "maskedPaths", as those paths are now listed by default in the config.json file generated by `runc spec` with runc 1.0.0. --- README | 3 -- projects/common/runc-config.json | 91 +++++++++++++++++++++++++++++++++++++++- rbm.conf | 16 ++++++- 3 files changed, 105 insertions(+), 5 deletions(-) diff --git a/README b/README index 10cadec..5b4a2bc 100644 --- a/README +++ b/README @@ -8,9 +8,6 @@ To build Tor Browser, you need a Linux distribution that has support for runc (such as Debian jessie, Ubuntu 16.04, Fedora 20, etc ...). On Debian jessie, the runc package is available in backports. On Debian stretch, the runc package is available in the main repository. -Version 0.1.1 of runc is required (which is the version available in -Debian stretch and jessie-backports). It is not yet working with runc -version 1.0.0: https://trac.torproject.org/projects/tor/ticket/23039 Your user account should have sudo access, which is required to be able to extract container file systems, start containers and copy files to and diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index 02be3b0..a4386c6 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -1,5 +1,5 @@ { - "ociVersion": "1.0.0-rc1", + "ociVersion": "1.0.0[% IF !c("var_p/runc100") %]-rc1[% END %]", "platform": { "os": "linux", [% IF c("var/container/arch") == 'i386' -%] @@ -22,6 +22,90 @@ "TERM=xterm" ], "cwd": "/", +[% IF c("var_p/runc100") -%] + "capabilities": { + "bounding": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_SETGID", + "CAP_SETUID", + "CAP_MKNOD", + "CAP_SYS_CHROOT", +[% IF c("var/container/CAP_SYS_ADMIN") -%] + "CAP_SYS_ADMIN", +[% END -%] + "CAP_FSETID", + "CAP_FOWNER", + "CAP_DAC_OVERRIDE", + "CAP_CHOWN" + ], + "effective": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_SETGID", + "CAP_SETUID", + "CAP_MKNOD", + "CAP_SYS_CHROOT", +[% IF c("var/container/CAP_SYS_ADMIN") -%] + "CAP_SYS_ADMIN", +[% END -%] + "CAP_FSETID", + "CAP_FOWNER", + "CAP_DAC_OVERRIDE", + "CAP_CHOWN" + ], + "inheritable": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_SETGID", + "CAP_SETUID", + "CAP_MKNOD", + "CAP_SYS_CHROOT", +[% IF c("var/container/CAP_SYS_ADMIN") -%] + "CAP_SYS_ADMIN", +[% END -%] + "CAP_FSETID", + "CAP_FOWNER", + "CAP_DAC_OVERRIDE", + "CAP_CHOWN" + ], + "permitted": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_SETGID", + "CAP_SETUID", + "CAP_MKNOD", + "CAP_SYS_CHROOT", +[% IF c("var/container/CAP_SYS_ADMIN") -%] + "CAP_SYS_ADMIN", +[% END -%] + "CAP_FSETID", + "CAP_FOWNER", + "CAP_DAC_OVERRIDE", + "CAP_CHOWN" + ], + "ambient": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_SETGID", + "CAP_SETUID", + "CAP_MKNOD", + "CAP_SYS_CHROOT", +[% IF c("var/container/CAP_SYS_ADMIN") -%] + "CAP_SYS_ADMIN", +[% END -%] + "CAP_FSETID", + "CAP_FOWNER", + "CAP_DAC_OVERRIDE", + "CAP_CHOWN" + ] + }, +[% ELSE -%] "capabilities": [ "CAP_AUDIT_WRITE", "CAP_KILL", @@ -38,6 +122,7 @@ "CAP_DAC_OVERRIDE", "CAP_CHOWN" ], +[% END -%] "rlimits": [ { "type": "RLIMIT_NOFILE", @@ -165,6 +250,10 @@ "/proc/kcore", "/proc/latency_stats", "/proc/timer_stats", +[% IF c("var_p/runc100") -%] + "/proc/timer_list", + "/sys/firmware", +[% END -%] "/proc/sched_debug" ], "readonlyPaths": [ diff --git a/rbm.conf b/rbm.conf index 7bda275..ef37575 100644 --- a/rbm.conf +++ b/rbm.conf @@ -329,7 +329,7 @@ runc: cat > '[% c("var/container/dir") %]'/config.json << EOF [% INCLUDE 'runc-config.json' %] EOF - sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] + sudo runc [% IF c("var_p/runc100") %]run[% ELSE %]start[% END %] -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] remote_put: | #!/bin/sh @@ -369,3 +369,17 @@ runc: ENV: TZ: UTC LC_ALL: C +--- | + # This part of the file contains options written in perl + use IO::CaptureOutput qw(capture_exec); + ( + var_p => { + # runc100 is true if we are using runc >= 1.0.0 + runc100 => sub { + # runc >= 1.0.0 exits with an error when trying to use an unknown + # command while older versions exit with 0 + my (undef, undef, $success) = capture_exec('sudo', 'runc', 'xyzxyzxyz'); + return !$success; + }, + }, + )

1 0

[torbutton/master] Bug 23526: 2017 Donation banner text ready for translation
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 0387a6f7f086c101e5b3612a8cfc94a956227a4a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 14 21:41:36 2017 -0700 Bug 23526: 2017 Donation banner text ready for translation --- src/chrome/locale/en/aboutTor.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index f9723bf..4436e21 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance. +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day

1 0

[tor-browser-build/master] Bumping rbm commit for bug 23513
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 90653b4d43d04c8394df3c194d5469aee8980510 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 15 06:21:33 2017 +0000 Bumping rbm commit for bug 23513 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 296fba7..78d9b11 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 296fba79fca70b922cc6eb2be8b830d8074b70e4 +Subproject commit 78d9b11aead5ba9b2386f7ebb2003772823fa293

1 0

[rbm/master] Bug 23513: run remote_finish when there was an error in remote_start
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 78d9b11aead5ba9b2386f7ebb2003772823fa293 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 14 14:03:27 2017 +0200 Bug 23513: run remote_finish when there was an error in remote_start We were looking at the $remote_tmp_src and $remote_tmp_dst variables to decide if running remote_finish is needed. However, those variables are not defined if there was an error in remote_start, and we should still run remote_finish in that case. Instead we look at the remote_exec option to decide if we need to run remote_finish. --- lib/RBM.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index b14909f..96a1b9b 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -1103,7 +1103,7 @@ sub build_run { } } EXIT: - if ($remote_tmp_src && $remote_tmp_dst) { + if (project_config($project, "remote_exec", $options)) { my $cmd = project_config($project, "remote_finish", $options); if ($cmd && (run_script($project, $cmd, sub { system(@_) }) != 0)) { $error ||= "Error finishing remote";

1 0

[tor-browser-build/master] Bug 23454: restore stderr in build logs
by gk＠torproject.org 11 Sep '17

11 Sep '17

commit 75af4379125bcf3979f54b5773f1ced1c37eb9c6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 11 14:30:03 2017 +0200 Bug 23454: restore stderr in build logs In #23425 we redirected the output from runc start to /dev/null to avoid annoying messages saying "stdin: is not a tty". However this also removes stderr from build logs. The command producing the `stdin: is not a tty` message is the `chown -R` command from runc/remote_put, so we now only hide stderr from that part while keeping it for the runc command running the build script. --- rbm.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index d574f7a..7bda275 100644 --- a/rbm.conf +++ b/rbm.conf @@ -329,7 +329,7 @@ runc: cat > '[% c("var/container/dir") %]'/config.json << EOF [% INCLUDE 'runc-config.json' %] EOF - sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF ! c("interactive") %]2>/dev/null[% END %] + sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] remote_put: | #!/bin/sh @@ -340,7 +340,10 @@ runc: -%] sudo mkdir -p '[% c("var/container/dir") %]'/rootfs/[% dst %] sudo cp -aP [% src %] '[% c("var/container/dir") %]'/rootfs/[% dst %] - [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'chown -R ' _ c("var/container/user") _ ' ' _ dst }) %] + # On Ubuntu, the /root/.profile file contains a `mesg n` line which is + # producing some `stdin: is not a tty` messages. To hide them, we hide + # stderr from this part by setting runc_hide_stderr. + [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'chown -R ' _ c("var/container/user") _ ' ' _ dst, runc_hide_stderr => 1 }) %] remote_get: | #!/bin/sh

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 1368406 Use non-Windows Printf Format Specifiers in MinGW r=froydnj
by gk＠torproject.org 11 Sep '17

11 Sep '17

commit 7169757638781da3a706c7700bcd4eb2bc613591 Author: Tom Ritter <tom(a)mozilla.com> Date: Mon May 29 00:38:57 2017 -0500 Bug 1368406 Use non-Windows Printf Format Specifiers in MinGW r=froydnj MinGW applies the gnu_printf format attribute, which expects non-Windows format specifiers. These macros were not designed to handle MinGW. MozReview-Commit-ID: HuJrK43Bg1A --HG-- extra : rebase_source : 6ccc1b2f4ab0e71584f442e86d94322e2c6382fb --- mfbt/SizePrintfMacros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfbt/SizePrintfMacros.h b/mfbt/SizePrintfMacros.h index ec55c62c5955..94eff2fe255b 100644 --- a/mfbt/SizePrintfMacros.h +++ b/mfbt/SizePrintfMacros.h @@ -18,7 +18,7 @@ * http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx */ -#if defined(XP_WIN) +#if defined(XP_WIN) && !defined(__MINGW32__) # define PRIoSIZE "Io" # define PRIuSIZE "Iu" # define PRIxSIZE "Ix"

1 0