updating to the latest upstream while preserving proxy support