bitcoin/bitcoin — pull request #4976 by theuni (2014-09-25 02:34:42+00:00)
Title: qt: add proxy to options overridden if necessary. Fixes #4975

If proxy is disabled in the gui but enabled via the command line, it needs to
be added to the override list.