bitcoin/bitcoin — pull request #1589 by Diapolo (2012-07-12 13:43:41+00:00)
Title: add a LOCK in optionsmodel to ApplyProxySettings()

- fixes #1560

I hope this does the job, as I never have worked with a LOCK() before ;). When looking over this, please just do this for ``ApplyProxySettings()``, as all other changes are not meant to be in this pull (this pull is based on #1572, which is ACKed already)!