Prevent error when using proxies after picking an Adapter
Fixed pickle support for requests.adapters.HTTPAdapter by adding
'proxy_manager' when unpickling.
Updated AUTHORS.
Move comment to the right place
8,000,000
Merge remote-tracking branch 'origin/master'
fix regression with cookiejar.iteritems()
Fixes #1805

Sure cookies are persisted to the session, but those new cookies are not added
to the next prepared request. We need to update that new request's CookieJar
with the new cookies.
preserve python2-like dict API for RequestCookieJar
Initial work towards replacing charade
Fix all remaining references to charade
Update the history and change the last last references to charade
split cookiejar as dict test
Merge pull request #1810 from kennethreitz/swap-charade-for-chardet

Swap charade for chardet
Merge pull request #1808 from kennethreitz/fix-cookies-saved-on-redirect

Fixes #1805
Re-raise DecodeError
Merge pull request #1816 from daftshady/master

Re-raise DecodeError
Merge pull request #1807 from podshumok/fix-request-cookiejar-as-dict

cookiejar.iteritems() is broken after 2.1.0 update
Update docs to highlight the value of r.encoding.
Merge pull request #1823 from Lukasa/moredocs

Update docs to highlight the value of r.encoding.