merging latest urllib3 with improved proxy support