merge revision(s) 57411: [Backport #13147]

Fix typo of URI#escape [Bug #13147]

	patched by Steve Hill <sghill.dev@gmail.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

lib/uri/common.rb

@@ -82,7 +82,7 @@ module URI
     # Escapes the string, replacing all unsafe characters with codes.
     #
     # This method is obsolete and should not be used. Instead, use
-    # CGI.escape, URI.www_form_encode or URI.www_form_encode_component
+    # CGI.escape, URI.encode_www_form or URI.encode_www_form_component
     # depending on your specific use case.
     #
     # == Usage

version.h

@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 35
+#define RUBY_PATCHLEVEL 36
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3