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

Helps fix getlantern/lantern#1719
Looks like this needs to be a map