URI: 
       tMerge pull request #6039 from interrupt00/document-how-to-disable-proxy - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit 1448bfe937eed233865acf64d38349b1e3ae2aa5
   DIR parent cf5872d2c1ab3eb95a460d19915fde449f771877
  HTML Author: ghost43 <somber.night@protonmail.com>
       Date:   Tue, 17 Mar 2020 22:27:13 +0000
       
       Merge pull request #6039 from interrupt00/document-how-to-disable-proxy
       
       Document how to disable proxy
       Diffstat:
         M electrum/commands.py                |       2 +-
       
       1 file changed, 1 insertion(+), 1 deletion(-)
       ---
   DIR diff --git a/electrum/commands.py b/electrum/commands.py
       t@@ -1224,7 +1224,7 @@ argparse._SubParsersAction.__call__ = subparser_call
        def add_network_options(parser):
            parser.add_argument("-1", "--oneserver", action="store_true", dest="oneserver", default=None, help="connect to one server only")
            parser.add_argument("-s", "--server", dest="server", default=None, help="set server host:port:protocol, where protocol is either t (tcp) or s (ssl)")
       -    parser.add_argument("-p", "--proxy", dest="proxy", default=None, help="set proxy [type:]host[:port], where type is socks4,socks5 or http")
       +    parser.add_argument("-p", "--proxy", dest="proxy", default=None, help="set proxy [type:]host[:port] (or 'none' to disable proxy), where type is socks4,socks5 or http")
            parser.add_argument("--noonion", action="store_true", dest="noonion", default=None, help="do not try to connect to onion servers")
            parser.add_argument("--skipmerklecheck", action="store_true", dest="skipmerklecheck", default=False, help="Tolerate invalid merkle proofs from server")