Merge branch 'master' into decoding-exceptions

diff --cc httpcore/__init__.py
index a6e4db97630703d96f6a2865b0a741aebbb2e24c,813b2b56c0332149dee28a7382d9865ddcc53f3d..1aa20f6507f23cbf68a1395009ba7678c2c484c9
--- 1/httpcore/__init__.py
--- 2/httpcore/__init__.py
+++ b/httpcore/__init__.py
@@@ -1,8 -1,12 +1,13 @@@
+ from .adapters.redirects import RedirectAdapter
+ from .client import Client
  from .config import PoolLimits, SSLConfig, TimeoutConfig
- from .connectionpool import ConnectionPool
- from .datastructures import URL, Origin, Request, Response
+ from .dispatch.connection import HTTPConnection
+ from .dispatch.connection_pool import ConnectionPool
+ from .dispatch.http2 import HTTP2Connection
+ from .dispatch.http11 import HTTP11Connection
  from .exceptions import (
      ConnectTimeout,
++    DecodingError,
      PoolTimeout,
      ProtocolError,
      ReadTimeout,

diff --cc httpcore/decoders.py
Simple merge

diff --cc httpcore/exceptions.py
index 9756a54f074aed8fd7c144697c92f24c6b830736,cf8d3f18ecff2175d4ec6dda508fb90da008779e..e8c8b72ee836038b665de8d5e961107b6a8a1951
--- 1/httpcore/exceptions.py
--- 2/httpcore/exceptions.py
+++ b/httpcore/exceptions.py
@@@ -42,7 -73,6 +73,13 @@@ class ResponseClosed(Exception)
      """
  
  
 +class DecodingError(Exception):
 +    """
 +    Decoding of the response failed.
 +    """
++
++    
+ class InvalidURL(Exception):
+     """
++    URL was missing a hostname, or was not one of HTTP/HTTPS.
+     """