getlantern/lantern#1762 Suggested improvements to original fix

@myleshorton Suggestions from my review of your changes
We need to hang on to the passed-in enproxy config so that custom users of Client (like the unit test) have the ability to force the use of their enproxyConfig.