Merge da25b39 into 10c56fb

gevent · Jul 12, 2018 · ba1ec1c · ba1ec1c
2 parents 10c56fb + da25b39
commit ba1ec1c
Show file tree

Hide file tree

Showing 84 changed files with 2,220 additions and 2,397 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,7 +7,7 @@
 1.3.5 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Update the bundled libuv from 1.20.1 to 1.22.0.
 
 - Update Python versions tested on Travis, including PyPy to 6.0. See :issue:`1195`.
 

diff --git a/deps/libuv/AUTHORS b/deps/libuv/AUTHORS
@@ -336,3 +336,12 @@ Bob Burger <rgburger@beckman.com>
 Thomas Versteeg <thomasversteeg@gmx.com>
 zzzjim <zzzjim@users.noreply.github.com>
 Alex Arslan <ararslan@comcast.net>
+Kyle Farnung <kfarnung@microsoft.com>
+ssrlive <30760636+ssrlive@users.noreply.github.com>
+Tobias Nießen <tniessen@tnie.de>
+Björn Linse <bjorn.linse@gmail.com>
+zyxwvu Shi <i@shiyc.cn>
+Peter Johnson <johnson.peter@gmail.com>
+Paolo Greppi <paolo.greppi@libpf.com>
+Shelley Vohr <shelley.vohr@gmail.com>
+Ujjwal Sharma <usharma1998@gmail.com>