Merge - upgrade pip/setuptools

diff --cc Lib/ensurepip/__init__.py
index 7fd81c4ceadb044d36c0c393b442b4bf83f6a1e7,25c55679a321f6b42efefb8f915558d44d59ae78..9f5d15109a3c43bdb67738e39828e900f477111e
--- 1/Lib/ensurepip/__init__.py
--- 2/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@@ -8,10 -8,23 +8,10 @@@ import tempfil
  __all__ = ["version", "bootstrap"]
  
  
- _SETUPTOOLS_VERSION = "28.7.1"
+ _SETUPTOOLS_VERSION = "28.8.0"
  
- _PIP_VERSION = "9.0.0"
+ _PIP_VERSION = "9.0.1"
  
 -# pip currently requires ssl support, so we try to provide a nicer
 -# error message when that is missing (http://bugs.python.org/issue19744)
 -_MISSING_SSL_MESSAGE = ("pip {} requires SSL/TLS".format(_PIP_VERSION))
 -try:
 -    import ssl
 -except ImportError:
 -    ssl = None
 -    def _require_ssl_for_pip():
 -        raise RuntimeError(_MISSING_SSL_MESSAGE)
 -else:
 -    def _require_ssl_for_pip():
 -        pass
 -
  _PROJECTS = [
      ("setuptools", _SETUPTOOLS_VERSION),
      ("pip", _PIP_VERSION),