[tbb-commits] [tor-browser/tor-browser-78.13.0esr-11.0-2] Merge remote-tracking branch 'richardgl/40597' into tor-browser-78.13.0esr-11.0-2

Fri Aug 27 21:34:52 UTC 2021

commit 4973e06ef1d4e179f233f51bafe13b7ca8508b36
Merge: 85c5352a179d 441ff44f35a7
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Aug 27 21:34:23 2021 +0000

    Merge remote-tracking branch 'richardgl/40597' into tor-browser-78.13.0esr-11.0-2

 browser/components/torconnect/TorConnectParent.jsm |  25 +-
 .../torpreferences/content/parseFunctions.jsm      |  89 ---
 .../torpreferences/content/torBridgeSettings.jsm   | 325 ---------
 .../torpreferences/content/torFirewallSettings.jsm |  72 --
 .../components/torpreferences/content/torPane.js   | 324 ++++----
 .../torpreferences/content/torProxySettings.jsm    | 245 -------
 browser/components/torpreferences/jar.mn           |  12 +-
 browser/modules/TorConnect.jsm                     |  47 +-
 browser/modules/TorSettings.jsm                    | 811 +++++++++++++++++++++
 browser/modules/moz.build                          |   1 +
 .../processsingleton/MainProcessSingleton.jsm      |   5 +
 toolkit/modules/AsyncPrefs.jsm                     |   2 -
 12 files changed, 1005 insertions(+), 953 deletions(-)