bitcoin/bitcoin — pull request #663 by laanwj (2011-11-24 18:47:06+00:00)
Title: Move check for fProxy and TOR to *after* fProxy has been set

See issue #659