Merge urllib/urllib2 security fix from 2.5 branch.