Pull changes to support round-robin through multiple upstream proxies, and dynamically updatable YAML-based configuration

Helps fix getlantern/lantern#1719
Yes, copying would be better.  Will make that change.