Merge branch 'master' of github.com:shazow/urllib3
Merge branch 'master' of github.com:shazow/urllib3
add assert to catch intermittent failure
Merge pull request #455 from kevinburke/source-address-update

More failure info on source address test.