Commit 39e76bb346760ad1183e8253186df3044752341e

tyler wanek 2017-01-27T16:05:20

Do not discard proxy_options that have been set when auto is specified