October 2019 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Release preparations for 9.5a1
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit c6b664f549650a07d63c7fc8695bbdc03c515f27 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 19 21:14:37 2019 +0000 Release preparations for 9.5a1 Changelog update and versions bump --- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 33 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 6 ++-- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index fe1b5d4..c30a71f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build5' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2930090..4d52fd2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,36 @@ +Tor Browser 9.5a1 -- October 23 2019 + * All Platforms + * Update Firefox to 68.2.0esr + * Bug 31740: Remove some unnecessary RemoteSettings instances + * Bug 30681: Set security.enterprise_roots.enabled to false + * Bug 31144: Review network code changes for Firefox 68 ESR + * Bug 21549: Enable WASM on standard security level + * Bug 28709: Enable FuzzyFox + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.20.1 + * Bug 32154: Custom bridge field only allows one line of input + * Bug 32112: Fix bad & escaping in translations + * Bug 31286: Update to tor settings related strings + * Translations update + * Bug 32125: Fix circuit display for bridge without a fingerprint + * Bug 32076: Upgrade to goptlib v1.1.0 + * Bug 32061: Bump snowflake version to b4f4b29a03 + * Bug 32092: Fix Tor Browser Support link in preferences + * Bug 32111: Fixed issue parsing user-provided bridge strings + * Bug 31749: Fix security level panel spawning events + * Bug 31920: Fix Security Level panel when its toolbar button moves to overflow + * Bug 31748+31961: Fix 'Learn More' links in Security Level preferences and panel + * Translations update + * Android + * Bug 32097: Fix conflicts in mobile onboarding while rebasing to 68.2.0esr + * Bug 26529: Notify user about possible proxy-bypass before opening external app + * Build System + * Windows + * Bug 32132: Re-enable jemalloc for Windows users + * Bug 31989: Backport backout of old mingw-gcc patch + * Android + * Bug 30461: Clean up tor-android-service project + Tor Browser 9.0a8 -- October 14 2019 * All Platforms * Bug 13543: Spoof smooth and powerEfficient for Media Capabilities diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 3171be7..c4010e7 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.19.5 +version: 0.2.20.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 3ba38e4..45a5c64 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0a8' - torbrowser_build: 'build2' + torbrowser_version: '9.5a1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0a7 + - 9.0a8 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Pick up latest Torbutton code
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 840c3930d54b38f52a990a8514a4a2deaffb3247 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 19 21:08:26 2019 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 9d744c6adc5e..05744bc48afd 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 9d744c6adc5ee3608e519c5db49528cd6ee6fe54 +Subproject commit 05744bc48afd08ca03a78c26b29d0d63c1b4cc61

1 0

[torbutton/master] Translations update
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 05744bc48afd08ca03a78c26b29d0d63c1b4cc61 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 19 21:05:40 2019 +0000 Translations update --- chrome/locale/da/browserOnboarding.properties | 8 ++++---- chrome/locale/ja/browserOnboarding.properties | 10 +++++----- chrome/locale/ka/browserOnboarding.properties | 12 ++++++------ chrome/locale/mk/aboutTBUpdate.dtd | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/chrome/locale/da/browserOnboarding.properties b/chrome/locale/da/browserOnboarding.properties index 0b6f4ddc..a1113637 100644 --- a/chrome/locale/da/browserOnboarding.properties +++ b/chrome/locale/da/browserOnboarding.properties @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Gå til Tor-netværk onboarding.tour-tor-network=Tor-netværk onboarding.tour-tor-network.title=Rejs på et decentraliseret netværk. onboarding.tour-tor-network.description=Tor Browser opretter forbindelse for dig til Tor-netværket, som køres af tusindvis af frivillige verden over. I modsætning til en VPN, er der ikke ét punkt som kan få det til at fejle, eller centraliseret indgang som du skal have tillid til for at bruge internettet privat. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. +onboarding.tour-tor-network.description-para2=NYT: Tor-netværksindstillinger som indeholder muligheden for at anmode om broer hvor Tor er blokeret, kan nu findes i Præferencer. onboarding.tour-tor-network.action-button=Juster dine Tor-netværksindstillinger onboarding.tour-tor-network.button=Gå til kredsløb-visning @@ -50,9 +50,9 @@ onboarding.tour-tor-update.prefix-updated=Opdateret onboarding.tour-tor-toolbar=Værktøjslinje onboarding.tour-tor-toolbar-update-9.0.title=Farvel Onion-knap. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=Forespørg en ny identitet +onboarding.tour-tor-toolbar-update-9.0.description=Vil ønsker at din oplevelse med Tor skal være fuldt integreret i Tor Browser. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Derfor kan du nu, i stedet for at bruge onion-knappen, se dine Tor-kredsløb via [i] på adresselinjen og anmod om en ny identitet med værktøjslinjeknappen eller [≡]-menuen. +onboarding.tour-tor-toolbar-update-9.0.button=Anmod om en ny identitet onboarding.tour-tor-toolbar-update-9.0.next-button=Gå til Tor-netværk # Circuit Display onboarding. diff --git a/chrome/locale/ja/browserOnboarding.properties b/chrome/locale/ja/browserOnboarding.properties index 1a3b8846..598b5960 100644 --- a/chrome/locale/ja/browserOnboarding.properties +++ b/chrome/locale/ja/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Tor ネットワークへ onboarding.tour-tor-network=Tor ネットワーク onboarding.tour-tor-network.title=分散型ネットワークを旅する。 onboarding.tour-tor-network.description=Tor Browser は、世界中の何千人ものボランティアによって運営されている Tor ネットワークにあなたを接続します。 VPN とは異なり、インターネットをプライベートに楽しむために信頼する必要があるのは、1つの障害点や1つの存在ではありません。 -onboarding.tour-tor-network.description-para2=新規：Torネットワーク設定。環境設定に追加され、Torが検問されている地域でブリッジをリクエストすることができます。 -onboarding.tour-tor-network.action-button=Torネットワーク設定を設定する +onboarding.tour-tor-network.description-para2=NEW: Tor ネットワークの設定は、[設定] メニューの中に移動しました。Tor がブロックされる地域でブリッジを要求することなどができます。 +onboarding.tour-tor-network.action-button=Tor ネットワークの設定を調整 onboarding.tour-tor-network.button=サーキットディスプレイへ onboarding.tour-tor-circuit-display=サーキットディスプレイ @@ -49,9 +49,9 @@ onboarding.tour-tor-update.prefix-new=新機能 onboarding.tour-tor-update.prefix-updated=更新 onboarding.tour-tor-toolbar=ツールバー -onboarding.tour-tor-toolbar-update-9.0.title= グッバイ、Onion Button。 -onboarding.tour-tor-toolbar-update-9.0.description=あなたのTorのすべてのデータをTor Browserに完全に移行したいと考えています。 -onboarding.tour-tor-toolbar-update-9.0.description-para2=そのため、今では、Onion buttonを使用せずに、URLバーの[ i ]をクリックしてTorサーキットを表示し、「このサイトに新しいサーキットを使用」をクリックするか、または[≡]メニューの「新しい識別子」をクリックして新しい識別子を要求することができます。 +onboarding.tour-tor-toolbar-update-9.0.title=さようなら、玉ねぎボタン。 +onboarding.tour-tor-toolbar-update-9.0.description=私たちは Tor の使用感を完全に Tor Browser に調和させたいと思っています。 +onboarding.tour-tor-toolbar-update-9.0.description-para2=そのため、玉ねぎボタンの代わりに、URL バーの [i] ボタンから Tor サーキットを確認したり、ツールバーボタンや [≡] メニューから新しい識別子をリクエストしたりできるようにしました。 onboarding.tour-tor-toolbar-update-9.0.button=新しい識別子をリクエストする方法 onboarding.tour-tor-toolbar-update-9.0.next-button=Tor ネットワークへ diff --git a/chrome/locale/ka/browserOnboarding.properties b/chrome/locale/ka/browserOnboarding.properties index 11832796..5de57a60 100644 --- a/chrome/locale/ka/browserOnboarding.properties +++ b/chrome/locale/ka/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=იხილეთ Tor-ქსელი onboarding.tour-tor-network=Tor-ქსელი onboarding.tour-tor-network.title=ისარგებლეთ დამოუკიდებელი, ერთპიროვნული მმართველობისგან დაცული ქსელით. onboarding.tour-tor-network.description=Tor-ბრაუზერით უკავშირდებით Tor-ქსელს, რომლის მუშაობასაც უზრუნველყოფს ათასობით მოხალისე, მთელი მსოფლიოს მასშტაბით. განსხვავებით VPN-ისგან, ამ შემთხვევაში არ გიწევთ ცალკეული პირის ან ერთეულის ნდობა და არავისზე ხართ დამოკიდებული, ინტერნეტით ვინაობის გაუმჟღავნებლად სარგებლობისას. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.description-para2=სიახლე: Tor-ქსელის გამართვა, აგრეთვე, ხიდების მოთხოვნა, Tor-ის შეზღუდვის პირობებში, ახლა უკვე შეგიძლიათ პარამეტრებიდან. +onboarding.tour-tor-network.action-button=გამართეთ Tor-ქსელის პარამეტრები onboarding.tour-tor-network.button=იხილეთ წრედის არე onboarding.tour-tor-circuit-display=წრედის არე @@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=ახალი onboarding.tour-tor-update.prefix-updated=განახლებული onboarding.tour-tor-toolbar=ხელსაწყოთა ზოლი -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.title=მშვიდობით Onion Button. +onboarding.tour-tor-toolbar-update-9.0.description=გვსურს, რომ Tor სრულად იყოს ჩაშენებული Tor-ბრაუზერში. +onboarding.tour-tor-toolbar-update-9.0.description-para2=სწორედ ამიტომ, ამიერიდან Tor-წრედს იხილავთ onion-ღილაკის ნაცვლად, [i] ნიშანზე დაწკაპებისას მისამართების ველში, ხოლო ახალი ვინაობის მოთხოვნა შეგეძლებათ ხელსაწყოთა ზოლიდან ან [≡] მენიუდან. +onboarding.tour-tor-toolbar-update-9.0.button=როგორ ხდება ახალი ვინაობის მოთხოვნა onboarding.tour-tor-toolbar-update-9.0.next-button=იხილეთ Tor-ქსელი # Circuit Display onboarding. diff --git a/chrome/locale/mk/aboutTBUpdate.dtd b/chrome/locale/mk/aboutTBUpdate.dtd index 9d8c386a..1649a138 100644 --- a/chrome/locale/mk/aboutTBUpdate.dtd +++ b/chrome/locale/mk/aboutTBUpdate.dtd @@ -1,7 +1,7 @@ <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Листа на промени"> <!ENTITY aboutTBUpdate.updated "Tor Browser е ажуриран."> -<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија,"> -<!ENTITY aboutTBUpdate.linkLabel " посетете ја нашата веб страна"> +<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија, "> +<!ENTITY aboutTBUpdate.linkLabel "посетете ја нашата веб страна"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Верзија"> <!ENTITY aboutTBUpdate.releaseDate "Датум на издавање">

1 0

[torbutton/master] Bug 32125: Fix circuit display for bridge without a fingerprint
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 73df82bd36a812496067c8bef948df5130cb991b Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Oct 17 14:40:40 2019 -0700 Bug 32125: Fix circuit display for bridge without a fingerprint Torbutton expects all bridges to have a fingerprint when creating the browser's circuit display. This patch works around the case when the user provides a bridge without a fingerprint by assuming it is a bridge, but we cannot determine the other displayed info: type (obfs4, meek, etc) nor the ip. In this scenario, the entry node in the circuit display will simply say "Bridge". --- chrome/content/tor-circuit-display.js | 24 ++++++++++++++++-------- modules/tor-control-port.js | 3 +++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index f75bd781..21bcc57b 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -84,12 +84,19 @@ let nodeDataForID = async function (controller, id) { result.ip = bridge.address.split(":")[0]; } catch (e) { } } else { - result.type = "default"; - // Get the IP address for the given node ID. - try { - let statusMap = await controller.getInfo("ns/id/" + id); - result.ip = statusMap.IP; - } catch (e) { } + // either dealing with a relay, or a bridge whose fingerprint is not saved in torrc + try { + let statusMap = await controller.getInfo("ns/id/" + id); + result.type = "default"; + result.ip = statusMap.IP; + } catch (e) { + // getInfo will throw if the given id is not a relay + // this probably means we are dealing with a user-provided bridge with no fingerprint + result.type = "bridge"; + // we don't know the ip or type, so leave blank + result.ip = ""; + result.bridgeType = ""; + } } if (result.ip) { // Get the country code for the node's IP address. @@ -294,10 +301,11 @@ let updateCircuitDisplay = function () { let bridgeType = nodeData[i].bridgeType; if (bridgeType === "meek_lite") { relayText += ": meek"; - } else if (bridgeType !== "vanilla") { + } + else if (bridgeType !== "vanilla" && bridgeType !== "") { relayText += ": " + bridgeType; } - } else { + } else if (nodeData[i].type == "default") { relayText = localizedCountryNameFromCode(nodeData[i].countryCode); } let ip = nodeData[i].ip.startsWith("0.") ? "" : nodeData[i].ip; diff --git a/modules/tor-control-port.js b/modules/tor-control-port.js index 6e310b52..9f6dbeb6 100644 --- a/modules/tor-control-port.js +++ b/modules/tor-control-port.js @@ -459,6 +459,9 @@ info.streamStatusParser = function (text) { "CircuitID", "Target"]); }; + +// TODO: fix this parsing logic to handle bridgeLine correctly +// fingerprint/id is an optional parameter // __info.bridgeParser(bridgeLine)__. // Takes a single line from a `getconf bridge` result and returns // a map containing the bridge's type, address, and ID.

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 26529 - Prompt before opening external app
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit 6dc05e67cdbbb0a74f2c24387a3ea7443e08b57c Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sat Oct 12 00:45:36 2019 +0000 Bug 26529 - Prompt before opening external app --- .../base/java/org/mozilla/gecko/BrowserApp.java | 7 +++++-- .../android/base/java/org/mozilla/gecko/GeckoApp.java | 7 +++++-- .../base/java/org/mozilla/gecko/GeckoApplication.java | 7 +++++-- .../base/java/org/mozilla/gecko/IntentHelper.java | 15 +++++++++++---- .../java/org/mozilla/gecko/toolbar/BrowserToolbar.java | 1 + .../org/mozilla/gecko/toolbar/ToolbarEditLayout.java | 18 ++++++++++++++---- 6 files changed, 41 insertions(+), 14 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 5d6f725dc1c5..ab19b78d54e7 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -175,6 +175,7 @@ import org.mozilla.gecko.util.WindowUtil; import org.mozilla.gecko.widget.ActionModePresenter; import org.mozilla.gecko.widget.AnchoredPopup; import org.mozilla.gecko.widget.AnimatedProgressBar; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.gecko.widget.GeckoActionProvider; import org.mozilla.gecko.widget.SplashScreen; import org.mozilla.geckoview.DynamicToolbarAnimator; @@ -2237,7 +2238,8 @@ public class BrowserApp extends GeckoApp if (AppConstants.RELEASE_OR_BETA) { Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse("market://details?id=" + getPackageName())); - startActivity(intent); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), intent); break; } @@ -4195,7 +4197,8 @@ public class BrowserApp extends GeckoApp if (flags.contains(OnUrlOpenListener.Flags.OPEN_WITH_INTENT)) { Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(url)); - startActivity(intent); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), intent); } else { // By default this listener is used for lists where the offline reader-view icon // is shown - hence we need to redirect to the reader-view page by default. diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 1504470b697e..42edb2bfc99b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -43,6 +43,7 @@ import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.gecko.util.ViewUtil; import org.mozilla.gecko.widget.ActionModePresenter; import org.mozilla.gecko.widget.AnchoredPopup; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.geckoview.GeckoSession; import org.mozilla.geckoview.GeckoSessionSettings; import org.mozilla.geckoview.GeckoView; @@ -766,11 +767,13 @@ public abstract class GeckoApp extends GeckoActivity if (email != null) { Uri contactUri = Uri.parse(email); Intent i = new Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT, contactUri); - startActivity(i); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), i); } else if (phone != null) { Uri contactUri = Uri.parse(phone); Intent i = new Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT, contactUri); - startActivity(i); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + this, getSupportFragmentManager(), i); } else { // something went wrong. Log.e(LOGTAG, "Received Contact:Add message with no email nor phone number"); diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index bb3cdec7c0fe..3801bb4d0b64 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -25,6 +25,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.design.widget.Snackbar; import android.support.multidex.MultiDex; +import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; import android.util.Base64; import android.util.Log; @@ -64,6 +65,7 @@ import org.mozilla.gecko.util.PRNGFixes; import org.mozilla.gecko.util.ProxySelector; import org.mozilla.gecko.util.ShortcutUtils; import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.geckoview.GeckoRuntime; import org.mozilla.geckoview.GeckoRuntimeSettings; @@ -813,8 +815,9 @@ public class GeckoApplication extends Application context.getContentResolver().delete(intent.getData(), null, null); } }; - ActivityHandlerHelper.startIntentForActivity(currentActivity, chooser, - handler); + ActivityHandlerHelper.registerActivityHandler(handler); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + currentActivity, ((AppCompatActivity)currentActivity).getSupportFragmentManager(), intent); } }); } diff --git a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java index c5b1666a31da..b5853a35ae20 100644 --- a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java @@ -123,7 +123,7 @@ public final class IntentHelper implements BundleEventListener { String className, String action, String title, - final boolean showPromptInPrivateBrowsing) { + boolean showPromptInPrivateBrowsing) { final Context context = getContext(); final Intent intent = getOpenURIIntent(context, targetURI, mimeType, action, title); @@ -141,10 +141,15 @@ public final class IntentHelper implements BundleEventListener { } } + // Always prompt for Intents + showPromptInPrivateBrowsing = true; + final FragmentActivity activity = getActivity(); if (!showPromptInPrivateBrowsing || activity == null) { if (activity == null) { - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + // We'll find out what this breaks. + return false; } return ActivityHandlerHelper.startIntentAndCatch(LOGTAG, context, intent); } else { @@ -152,7 +157,7 @@ public final class IntentHelper implements BundleEventListener { // statically, but since this method is called from Gecko and I'm // unfamiliar with that code, this is a simpler solution. return ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( - context, activity.getSupportFragmentManager(), intent); + activity, activity.getSupportFragmentManager(), intent); } } @@ -472,7 +477,9 @@ public final class IntentHelper implements BundleEventListener { // isn't owned exclusively by Firefox, so there's no real benefit to using content:// URIs // here. try (StrictModeContext unused = StrictModeContext.allowAllVmPolicies()) { - ActivityHandlerHelper.startIntentForActivity(activity, intent, handler); + // Always prompt. + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + activity, activity.getSupportFragmentManager(), intent); } catch (SecurityException e) { Log.w(LOGTAG, "Forbidden to launch activity.", e); } diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java index 2bc379cecb8b..3ba208ea0fcc 100644 --- a/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java +++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java @@ -222,6 +222,7 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout prefs = new ToolbarPrefs(); urlDisplayLayout.setToolbarPrefs(prefs); urlEditLayout.setToolbarPrefs(prefs); + urlEditLayout.setActivity(activity); // ScrollViews are allowed to have only one child. final View scrollChild = urlDisplayScroll.getChildAt(0); diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java index a28847285350..ecd8d49f5a41 100644 --- a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java +++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java @@ -9,6 +9,7 @@ import android.app.Activity; import android.content.Intent; import android.graphics.drawable.Drawable; import android.speech.RecognizerIntent; +import android.support.v7.app.AppCompatActivity; import android.widget.Button; import org.mozilla.gecko.ActivityHandlerHelper; import org.mozilla.gecko.GeckoAppShell; @@ -30,6 +31,7 @@ import org.mozilla.gecko.util.HardwareUtils; import org.mozilla.gecko.util.InputOptionsUtils; import org.mozilla.gecko.util.StringUtils; import org.mozilla.gecko.util.ThreadUtils; +import org.mozilla.gecko.widget.ExternalIntentDuringPrivateBrowsingPromptFragment; import org.mozilla.gecko.widget.themed.ThemedImageButton; import org.mozilla.gecko.widget.themed.ThemedLinearLayout; @@ -60,6 +62,8 @@ public class ToolbarEditLayout extends ThemedLinearLayout { private final ThemedImageButton mVoiceInput; private final ThemedImageButton mQrCode; + private Activity mActivity; + private OnFocusChangeListener mFocusChangeListener; private boolean showKeyboardOnFocus = false; // Indicates if we need to show the keyboard after the app resumes @@ -185,6 +189,10 @@ public class ToolbarEditLayout extends ThemedLinearLayout { mQrCode.setPrivateMode(isPrivate); } + public void setActivity(Activity activity) { + mActivity = activity; + } + /** * Called when the parent gains focus (on app launch and resume) */ @@ -294,8 +302,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout { Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.ACTIONBAR, "voice_input_launch"); final Intent intent = InputOptionsUtils.createVoiceRecognizerIntent(getResources().getString(R.string.voicesearch_prompt)); - final Activity activity = ActivityUtils.getActivityFromContext(getContext()); - ActivityHandlerHelper.startIntentForActivity(activity, intent, new ActivityResultHandler() { + ActivityHandlerHelper.registerActivityHandler(new ActivityResultHandler() { @Override public void onActivityResult(int resultCode, Intent data) { if (resultCode != Activity.RESULT_OK) { @@ -316,6 +323,8 @@ public class ToolbarEditLayout extends ThemedLinearLayout { imm.showSoftInput(mEditText, InputMethodManager.SHOW_IMPLICIT); } }); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + mActivity, ((AppCompatActivity)mActivity).getSupportFragmentManager(), intent); } private boolean qrCodeIsEnabled(Context context) { @@ -331,8 +340,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout { Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.ACTIONBAR, "qrcode_input_launch"); final Intent intent = InputOptionsUtils.createQRCodeReaderIntent(); - final Activity activity = ActivityUtils.getActivityFromContext(getContext()); - ActivityHandlerHelper.startIntentForActivity(activity, intent, new ActivityResultHandler() { + ActivityHandlerHelper.registerActivityHandler(new ActivityResultHandler() { @Override public void onActivityResult(int resultCode, Intent intent) { if (resultCode == Activity.RESULT_OK) { @@ -353,5 +361,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout { // as well as the actual result, which may hold a URL. } }); + ExternalIntentDuringPrivateBrowsingPromptFragment.showDialogOrAndroidChooser( + mActivity, ((AppCompatActivity)mActivity).getSupportFragmentManager(), intent); } }

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 1585351 - Bug 1460357 disabled AVX instructions for the mingw build; this is no longer needed r=lsalzman
by gk＠torproject.org 19 Oct '19

19 Oct '19

commit f6b7218543a748a5f49c67dc397bb6348756a7a3 Author: Tom Ritter <tom(a)mozilla.com> Date: Thu Oct 3 21:02:16 2019 +0000 Bug 1585351 - Bug 1460357 disabled AVX instructions for the mingw build; this is no longer needed r=lsalzman Bug 1460357 disabled AVX because gcc was generating unaligned instructions. But clang doesn't seem to do that. Differential Revision: https://phabricator.services.mozilla.com/D48072 --HG-- extra : moz-landing-system : lando --- gfx/skia/skia/src/opts/SkOpts_hsw.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp index b04eaa91f8dc..d87ad1eb0503 100644 --- a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp +++ b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp @@ -7,7 +7,7 @@ // As described in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85525, MinGW will produce // unaligned instructions for this code, resulting in a crash. -#if defined(__AVX2__) && !defined(__MINGW32__) +#if defined(__AVX2__) #include <immintrin.h> #include <stdint.h>

1 0

[tor-browser-build/maint-9.0] Pick up new tag for Tor Launcher for build2
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit 803d014ed9be0ff5a2ee253798f3c3e9b0fc1723 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 18 21:21:39 2019 +0000 Pick up new tag for Tor Launcher for build2 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 ++- projects/tor-launcher/config | 2 +- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cf41275..e2e668f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -38,8 +38,9 @@ Tor Browser 9.0 -- October 22 2019 * Update Tor to 0.4.1.6 * Update OpenSSL to 1.1.1d * Bug 31844: OpenSSL 1.1.1d fails to compile for some platforms/architectures - * Update Tor Launcher to 0.2.20 + * Update Tor Launcher to 0.2.20.1 * Bug 28044: Integrate Tor Launcher into tor-browser + * Bug 32154: Custom bridge field only allows one line of input * Bug 31286: New strings for about:preferences#tor * Bug 31303: Do not launch tor in browser toolbox * Bug 32112: Fix bad & escaping in translations diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 54e4973..c4010e7 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.20 +version: 0.2.20.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index ab0bbb5..926e3aa 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5.5 project_name: tor-browser

1 0

[tor-launcher/master] Release preparations for 0.2.20.1
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit c6e01ca0c243f7f9ba36f7d954c02732d3ed2f63 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 18 21:14:25 2019 +0000 Release preparations for 0.2.20.1 Version bump and translations update --- src/chrome/locale/da/network-settings.dtd | 26 ++++++++++----------- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/he/network-settings.dtd | 2 +- src/chrome/locale/ja/network-settings.dtd | 2 +- src/chrome/locale/ka/network-settings.dtd | 34 ++++++++++++++-------------- src/chrome/locale/lt/network-settings.dtd | 2 +- src/chrome/locale/mk/network-settings.dtd | 2 +- src/chrome/locale/mk/torlauncher.properties | 2 +- src/chrome/locale/ml/network-settings.dtd | 8 +++---- src/chrome/locale/pt-BR/network-settings.dtd | 2 +- src/chrome/locale/zh-CN/network-settings.dtd | 4 ++-- src/install.rdf | 2 +- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 3c986a6..f7d7111 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "Computeren går gennem en firewall som kun tillader forbindelse til bestemte porte"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Tilladte porte"> <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> <!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> <!ENTITY torsettings.useBridges.default.placeholder "vælg en bro"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Tor-indstillinger"> +<!ENTITY torPreferences.torSettingsDescription "Tor Browser sender din trafik over Tor-netværket som køres af tusindvis af frivillige verden over." > <!ENTITY torPreferences.learnMore "Læs mere"> <!ENTITY torPreferences.bridges "Broer"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "Broer hjælper dig med at tilgå Tor-netværket steder hvor Tor er blokeret. Afhængig af hvor du er, så kan en bro virke bedre end en anden."> +<!ENTITY torPreferences.useBridge "Brug en bro"> <!ENTITY torPreferences.requestNewBridge "Anmod om en ny bro…"> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Formidl en bro"> <!ENTITY torPreferences.advanced "Avanceret"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Konfigurer hvordan Tor Browser opretter forbindelse til internettet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Kommaseparerede værdier"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Anmod om bro"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakter BridgeDB. Vent venligst."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA'en for at anmode om en bro."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke korrekt. Prøv venligst igen."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Vis Tor-loggene."> +<!ENTITY torPreferences.viewLogs "Vis logge…"> +<!ENTITY torPreferences.torLogsDialogTitle "Tor-logge"> diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index dcbf959..22f103b 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -81,5 +81,5 @@ Selon votre position géographique, un pont pourrait fonctionner mieux qu’un a <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Résoudre le captcha pour demander un pont."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez ressayer."> <!ENTITY torPreferences.viewTorLogs "Visualiser les journaux Tor."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "Visualiser les journaux…"> <!ENTITY torPreferences.torLogsDialogTitle "Journaux Tor"> diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 4289894..5a8e113 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "פתור את ה־CAPTCHA כדי לבקש גשר."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "הפתרון אינו נכון. אנא נסה שוב."> <!ENTITY torPreferences.viewTorLogs "הצג את יומני Tor."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "הצג יומנים..."> <!ENTITY torPreferences.torLogsDialogTitle "יומני Tor"> diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 7a83a71..2d2dce7 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -69,7 +69,7 @@ <!ENTITY torPreferences.bridges "ブリッジ"> <!ENTITY torPreferences.bridgesDescription "ブリッジは Tor がブロックされる地域から Tor ネットワークにアクセスすることを手助けします。地域によって、あるブリッジが他のものよりうまく動作する可能性があります。"> <!ENTITY torPreferences.useBridge "ブリッジを使用する"> -<!ENTITY torPreferences.requestNewBridge "新たなブリッジをリクエスト。"> +<!ENTITY torPreferences.requestNewBridge "新しいブリッジを要求…"> <!ENTITY torPreferences.provideBridge "ブリッジを指定する"> <!ENTITY torPreferences.advanced "詳細"> <!ENTITY torPreferences.advancedDescription "Tor Browser がインターネットに接続する方法を設定します。"> diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index 786a1e3..82ae5ad 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "არასავალდებულო"> <!ENTITY torsettings.useProxy.checkbox "ინტერნეტთან დასაკავშირებლად პროქსის ვიყენებ"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.type "პროქსის სახეობა"> <!ENTITY torsettings.useProxy.type.placeholder "მიუთითეთ პროქსის სახეობა"> <!ENTITY torsettings.useProxy.address "მისამართი"> <!ENTITY torsettings.useProxy.address.placeholder "IP-მისამართი ან დასახელება"> -<!ENTITY torsettings.useProxy.port "Port"> -<!ENTITY torsettings.useProxy.username "ნიკი"> +<!ENTITY torsettings.useProxy.port "პორტი"> +<!ENTITY torsettings.useProxy.username "მეტსახელი"> <!ENTITY torsettings.useProxy.password "პაროლი"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "კომპიუტერი ინტერნეტს უკავშირდება ქსელის ფარის გავლით, რომელშიც მხოლოდ ცალკეული პორტებია დაშვებული"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "დაშვებული პორტები"> <!ENTITY torsettings.useBridges.checkbox "Tor შეზღუდულია ჩემს ქვეყანაში"> <!ENTITY torsettings.useBridges.default "ჩაშენებული გადამცემი ხიდის მითითება"> <!ENTITY torsettings.useBridges.default.placeholder "ხიდის მითითება"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Tor-ის პარამეტრები"> +<!ENTITY torPreferences.torSettingsDescription "Tor-ბრაუზერი თქვენს კავშირს ატარებს Tor-ქსელის გავლით, რომლის მუშაობასაც უზრუნველყოფს ათასობით მოხალისე მთელი მსოფლიოდან." > <!ENTITY torPreferences.learnMore "იხილეთ ვრცლად"> <!ENTITY torPreferences.bridges "გადამცემი ხიდები"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "გადამცემი ხიდების მეშვეობით შეგიძლიათ დაუკავშირდეთ Tor-ქსელს იქ, სადაც Tor-ს ზღუდავენ. იმისდა მიხედვით, თუ სად იმყოფებით, ზოგმა ხიდმა უკეთ შეიძლება იმუშაოს, ვიდრე სხვამ."> +<!ENTITY torPreferences.useBridge "ხიდის გამოყენება"> <!ENTITY torPreferences.requestNewBridge "ახალი გადამცემი ხიდის მოთხოვნა..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> -<!ENTITY torPreferences.advanced "Advanced"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.provideBridge "გადამცემი ხიდის მითითება"> +<!ENTITY torPreferences.advanced "დამატებით"> +<!ENTITY torPreferences.advancedDescription "მიუთითეთ, თუ როგორ დაუკავშირდეს Tor-ბრაუზერი ინტერნეტს."> +<!ENTITY torPreferences.firewallPortsPlaceholder "მძიმით გამოყოფილი მნიშვნელობები"> +<!ENTITY torPreferences.requestBridgeDialogTitle "ხიდის მოთხოვნა"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "უკავშირდება BridgeDB-ს. გთხოვთ, მოითმინოთ."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "გაიარეთ CAPTCHA, გადამცემი ხიდის მოთხოვნისთვის."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "გადაწყვეტა არასწორია. გთხოვთ სცადოთ ხელახლა."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "იხილეთ Tor-ის ჩანაწერები."> +<!ENTITY torPreferences.viewLogs "იხილეთ ჩანაწერები..."> +<!ENTITY torPreferences.torLogsDialogTitle "Tor-ის ჩანაწერები"> diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index b7ea124..faf089e 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Norėdami užklausti tinklų tiltą, išspręskite saugos kodą."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Sprendimas neteisingas. Bandykite dar kartą."> <!ENTITY torPreferences.viewTorLogs "Žiūrėti Tor žurnalą."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "Rodyti žurnalus…"> <!ENTITY torPreferences.torLogsDialogTitle "Tor žurnalas"> diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index add1b04..89dfcdc 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решете ја ЗАДАЧАТА за да побарате мост."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Решението е погрешно. Ве молиме обидете се повторно."> <!ENTITY torPreferences.viewTorLogs "Види ги Tor логовите."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "Види логови..."> <!ENTITY torPreferences.torLogsDialogTitle "Tor Логови"> diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 806ac8d..4055e24 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -52,7 +52,7 @@ torlauncher.forAssistance2=За помош, посетете ја %S torlauncher.copiedNLogMessages=Копирањето е завршено. %S Tor лог пораките се подготвени да бидат залепени во уредувач на текст или во порака за е-пошта. -torlauncher.bootstrapStatus.starting=Започнувањето +torlauncher.bootstrapStatus.starting=Започнување torlauncher.bootstrapStatus.conn_pt=Поврзување со мост torlauncher.bootstrapStatus.conn_done_pt=Поврзан со мост torlauncher.bootstrapStatus.conn_proxy=Поврзување со прокси diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index 8576c68..f8dbadf 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -26,9 +26,9 @@ <!ENTITY torsettings.optional "നിര്ബന്ധമില്ലാത്തത് "> <!ENTITY torsettings.useProxy.checkbox "ഞാൻ ഇന്റർനൈറ്റിലെക് ബന്ധപ്പെടാൻ ഒരു പ്രോക്സി ഉപയോഗിക്കുന്നു "> -<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.type "പ്രോക്സി തരം"> <!ENTITY torsettings.useProxy.type.placeholder "ഒരു പ്രോക്സി ഇനം തിരഞ്ഞെടുക്കുക :"> -<!ENTITY torsettings.useProxy.address "Address"> +<!ENTITY torsettings.useProxy.address "വിലാസം"> <!ENTITY torsettings.useProxy.address.placeholder "ഐ പി മേൽവിലാസം അല്ലെങ്കിൽ ഹോസ്റ്റ് നെയിം "> <!ENTITY torsettings.useProxy.port "പോര്‍ട്ട്"> <!ENTITY torsettings.useProxy.username "ഉപയോക്താവിന്റെ പേർ "> @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "എച് ടി ടി പി /എച് ടി ടി പി എസ് "> <!ENTITY torsettings.firewall.checkbox "ഈ കംപ്യൂട്ടർ ചില പ്രത്യേക പോർട്ടുകളിലൂടെ മാത്രം ബന്ധം അനുവദിക്കുന്ന ഫയർവാൾ വഴിയാണ് പോകുന്നത്"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "അനുവദനീയമായ പോർട്ടുകൾ"> <!ENTITY torsettings.useBridges.checkbox "എന്റെ രാജ്യത്തു ടോർ സെൻസർ ചെയ്തിട്ടുള്ളതാണ് "> <!ENTITY torsettings.useBridges.default "ഇതിനകത്തു തന്നെയുള്ള ഒരു ബ്രിഡ്ജ് തിരഞ്ഞെടുക്കുക "> <!ENTITY torsettings.useBridges.default.placeholder "ഒരു ബ്രിഡ്ജ് തിരഞ്ഞെടുക്കുക "> @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ബ്രിഡ്ജിനെ കിട്ടാൻ തന്നിരിക്കുന്ന കാപ്ച പരിഹരിക്കുക "> <!ENTITY torPreferences.requestBridgeErrorBadSolution "പരിഹാരം ശെരിയല്ല . ദയവായി ഒന്നുകൂടെ ശ്രെമിക്കുക "> <!ENTITY torPreferences.viewTorLogs "ടോർ ലോഗ്സ് കാണുക ."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "ലോഗുകൾ കാണുക…"> <!ENTITY torPreferences.torLogsDialogTitle "ടോർ ലോഗ്സ് "> diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index 25c4d9a..b1c40d8 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente."> <!ENTITY torPreferences.viewTorLogs "Veja os logs do Tor."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "Ver registros…"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 3f29971..8c9bc74 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "允许的端口"> <!ENTITY torsettings.useBridges.checkbox "我所在的国家对 Tor 进行了审查"> <!ENTITY torsettings.useBridges.default "选择内置网桥"> <!ENTITY torsettings.useBridges.default.placeholder "选择网桥"> @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "请输入验证码以获取网桥。"> <!ENTITY torPreferences.requestBridgeErrorBadSolution "结果并不正确，请重试。"> <!ENTITY torPreferences.viewTorLogs "查看 Tor 日志。"> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "查看日志"> <!ENTITY torPreferences.torLogsDialogTitle "Tor 日志"> diff --git a/src/install.rdf b/src/install.rdf index e77f99e..7b456cd 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.20</em:version> + <em:version>0.2.20.1</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Bug 32154: Custom bridge field only allows one line of input
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit d3c66f516b07271ea4bb5f2481d9e02ff912b0ce Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Oct 18 13:39:15 2019 -0400 Bug 32154: Custom bridge field only allows one line of input Mozilla is working on removing XUL <textbox>, and prior to ESR68 they removed support for the multiline attribute. Switch to <html:textarea> and adjust styles to make the appearance closely match <textbox>. --- src/chrome/content/network-settings-shared.js | 6 +++--- src/chrome/content/network-settings-wizard.xul | 1 + src/chrome/content/network-settings.js | 4 +++- src/chrome/content/network-settings.xul | 1 + src/chrome/skin/network-settings.css | 11 ++++++++++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings-shared.js b/src/chrome/content/network-settings-shared.js index f1bdb91..1575f3d 100644 --- a/src/chrome/content/network-settings-shared.js +++ b/src/chrome/content/network-settings-shared.js @@ -122,9 +122,9 @@ var bridgeSettings = ` <vbox id="bridgeCustomEntry"> <label id="bridgeListLabel" style="margin-top:0px;" value="&torsettings.useBridges.label;" control="bridgeList"/> - <textbox id="bridgeList" multiline="true" rows="3" wrap="off" - oninput="onCustomBridgesTextInput();" - placeholder="&torsettings.useBridges.placeholder;"/> + <html:textarea id="bridgeList" rows="3" wrap="off" + oninput="onCustomBridgesTextInput();" + placeholder="&torsettings.useBridges.placeholder;"/> </vbox> </groupbox> </vbox> diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index ec48bd0..98dbdd8 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -12,6 +12,7 @@ <wizard id="TorNetworkSettings" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml" defaulttitle="&torsettings.wizard.title.default;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 8c1db0f..709c939 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -2485,6 +2485,7 @@ function setElemValue(aID, aValue) elem.checked = val; toggleElemUI(elem); break; + case "html:textarea": case "textbox": if (Array.isArray(aValue)) { @@ -2534,7 +2535,7 @@ function setBridgeListElemValue(aBridgeArray) // Returns a Boolean (for checkboxes/radio buttons) or a -// string (textbox and menulist). +// string (textarea, textbox, and menulist). // Leading and trailing white space is trimmed from strings. function getElemValue(aID, aDefaultValue) { @@ -2550,6 +2551,7 @@ function getElemValue(aID, aDefaultValue) case "radio": rv = elem.selected; break; + case "html:textarea": case "textbox": case "menulist": case "richlistbox": diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 6a8fac4..1d3423e 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -13,6 +13,7 @@ <dialog id="TorNetworkSettings" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml" title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 9fed4f2..aae7c0b 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -5,6 +5,8 @@ * vim: set sw=2 sts=2 ts=8 et syntax=css: */ +@namespace html "http://www.w3.org/1999/xhtml"; + dialog { width: 45em; height: 41em; @@ -294,13 +296,20 @@ dialog .help { max-width: 34em; } +html|textarea { + padding: 4px !important; + margin-top: 4px; + font-family: inherit; +} + /* Increase font size on Windows for readability */ .os-windows div, .os-windows label, .os-windows description, +.os-windows html|textarea, .os-windows textbox { - font-size: 120%; + font-size: 120% !important; } .torWarning {

1 0

[tor-browser-build/maint-9.0] Fix typos and add missing items to 9.0 Changelog
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit dbc30cd448b3f38f732f5f1fece8ba40e518115a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 18 19:01:17 2019 +0000 Fix typos and add missing items to 9.0 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9a4666d..cf41275 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -11,7 +11,7 @@ Tor Browser 9.0 -- October 22 2019 * Bug 31602: Remove Pocket indicators in UI and disable it * Bug 31914: Fix eslint linter error * Bug 30429: Rebase patches for Firefox 68 ESR - * Bug 31444: Review network code changes for Firefox 68 ESR + * Bug 31144: Review network code changes for Firefox 68 ESR * Bug 10760: Integrate Torbutton into Tor Browser directly * Bug 25856: Remove XUL overlays from Torbutton * Bug 31322: Fix about:tor assertion failure debug builds @@ -32,6 +32,7 @@ Tor Browser 9.0 -- October 22 2019 * Bug 31015: Disabling SVG hides UI icons in extensions * Bug 30681: Set security.enterprise_roots.enabled to false * Bug 30538: Unable to comment on The Independent Newspaper + * Bug 31209: View PDF in Tor Browser is fuzzy * Translations update * Windows + OS X + Linux * Update Tor to 0.4.1.6 @@ -55,7 +56,7 @@ Tor Browser 9.0 -- October 22 2019 * Bug 32111: Fixed issue parsing user-provided bridge strings * Bug 31749: Fix security level panel spawning events * Bug 31920: Fix Security Level panel when its toolbar button moves to overflow - * Bug 31748: Fix 'Learn More' links in Security Level preferences and panel + * Bug 31748+31961: Fix 'Learn More' links in Security Level preferences and panel * Bug 28044: Integrate Tor Launcher into tor-browser * Bug 31059: Enable Letterboxing * Bug 30468: Add mk locale @@ -120,6 +121,7 @@ Tor Browser 9.0 -- October 22 2019 * Bug 31822: Security slider is not really visible on Android anymore * Bug 24920: Only create Private tabs in permanent Private Browsing Mode * Bug 31730: Revert aarch64-workaround against JIT-related crashes + * Bug 32097: Fix conflicts in mobile onboarding while rebasing to 68.2.0esr * Build System * All Platforms * Bug 30585: Provide standalone clang 8 project across all platforms

1 0