Merge branch 'release'

2 files changed, 39 insertions, 2 deletions

diff --git a/docker/version.py b/docker/version.py
index a274307..0b27a26 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "3.6.0-dev"
+version = "3.6.0"
 version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
diff --git a/docs/change-log.md b/docs/change-log.md
index 1b2d620..873db8c 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -1,10 +1,47 @@
 Change log
 ==========
 
+3.6.0
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone=55?closed=1)
+
+### Features
+
+* Added support for connecting to the Docker Engine over SSH. Additional
+  dependencies for this feature can be installed with
+  `pip install "docker[ssh]"`
+* Added support for the `named` parameter in `Image.save`, which may be
+  used to ensure the resulting tarball retains the image's name on save.
+
+### Bugfixes
+
+* Fixed a bug where builds on Windows with a context path using the `\\?\`
+  prefix would fail with some relative Dockerfile paths.
+* Fixed an issue where pulls made with the `DockerClient` would fail when
+  setting the `stream` parameter to `True`.
+
+### Miscellaneous
+
+* The minimum requirement for the `requests` dependency has been bumped
+  to 2.20.0
+
+3.5.1
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/54?closed=1)
+
+### Miscellaneous
+
+* Bumped version of `pyOpenSSL` in `requirements.txt` and `setup.py` to prevent
+  installation of a vulnerable version
+
+* Docs fixes
+
 3.5.0
 -----
 
-[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone=53?closed=1)
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/53?closed=1)
 
 ### Deprecation warning