fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...

fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

Bug 42343: Read built-in bridges from pt_config.json instead of
preferences.

Update the way in which we query the PTs we have bundled bridge lines
for.

browser/components/torpreferences/content/builtinBridgeDialog.mjs

@@ -3,7 +3,6 @@ import { TorStrings } from "resource://gre/modules/TorStrings.sys.mjs";
 import {
   TorSettings,
   TorBridgeSource,
-  TorBuiltinBridgeTypes,
 } from "resource://gre/modules/TorSettings.sys.mjs";
 
 import {
@@ -62,7 +61,7 @@ export class BuiltinBridgeDialog {
     )) {
       const radio = optionEl.querySelector("radio");
       const type = radio.value;
-      optionEl.hidden = !TorBuiltinBridgeTypes.includes(type);
+      optionEl.hidden = !TorSettings.builtinBridgeTypes.includes(type);
       radio.label = typeStrings[type].label;
       optionEl.querySelector(
         ".builtin-bridges-option-description"

browser/components/torpreferences/content/connectionPane.js

@@ -867,7 +867,7 @@ const gConnectionPane = (function () {
     },
 
     init() {
-      this._populateXUL();
+      TorSettings.initializedPromise.then(() => this._populateXUL());
 
       const onUnload = () => {
         window.removeEventListener("unload", onUnload);