[tor-commits] [tor-messenger-build/master] Remove redundant TorButton config options

[arlo at torproject.org]

commit 813b1c5ba350af93ff346477b31c79c33e818ee1
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon Jul 11 12:18:00 2016 -0400

    Remove redundant TorButton config options
---
 projects/tor-messenger/start-tor-messenger | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/projects/tor-messenger/start-tor-messenger b/projects/tor-messenger/start-tor-messenger
index ad0da4a..a1bbb05 100755
--- a/projects/tor-messenger/start-tor-messenger
+++ b/projects/tor-messenger/start-tor-messenger
@@ -310,25 +310,14 @@ EOF
 # TOR_CONTROL_PASSWD='"secret"'
 #
 # Yes, the variable MUST be double-quoted, then single-quoted, exactly as
-# shown. This is used by TorButton and Tor Launcher to authenticate to Tor's
-# ControlPort, and is necessary for using TB with a system-installed Tor.
+# shown. This is used by Tor Launcher to authenticate to Tor's ControlPort,
+# and is necessary for using TM with a system-installed Tor.
 #
 # Additionally, if using a system-installed Tor, the following about:config
 # options should be set (values in <> mean they are the value taken from your
 # torrc):
 #
 # SETTING NAME                            VALUE
-# extensions.torbutton.banned_ports       [...],<SocksPort>,<ControlPort>
-# extensions.torbutton.block_disk         false
-# extensions.torbutton.custom.socks_host  127.0.0.1
-# extensions.torbutton.custom.socks_port  <SocksPort>
-# extensions.torbutton.inserted_button    true
-# extensions.torbutton.launch_warning     false
-# extensions.torbutton.loglevel           2
-# extensions.torbutton.logmethod          0
-# extensions.torbutton.settings_method    custom
-# extensions.torbutton.socks_port         <SocksPort>
-# extensions.torbutton.use_privoxy        false
 # extensions.torlauncher.control_port      <ControlPort>
 # extensions.torlauncher.loglevel          2
 # extensions.torlauncher.logmethod         0