merge revision(s) 40574:

	* doc/security.rdoc: Add note about reporting security vulns


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

3 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f6b5ffb0d..1c07347455 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat May  4 23:48:56 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/security.rdoc: Add note about reporting security vulns
+
 Sat May  4 23:44:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (rb_obj_is_kind_of): skip prepending modules.
diff --git a/doc/security.rdoc b/doc/security.rdoc
index 9f4bca67c5..2cf6531785 100644
--- a/doc/security.rdoc
+++ b/doc/security.rdoc
@@ -10,6 +10,11 @@ Please check the full list of publicly known CVEs and how to correctly report a
 security vulnerability, at: http://www.ruby-lang.org/en/security/
 Japanese version is here: http://www.ruby-lang.org/ja/security/
 
+Security vulnerabilities should be reported via an email to
+mailto:security@ruby-lang.org ({the PGP public
+key}[http://www.ruby-lang.org/security.asc]), which is a private mailing list.
+Reported problems will be published after fixes.
+
 == <code>$SAFE</code>
 
 Ruby provides a mechanism to restrict what operations can be performed by Ruby
diff --git a/version.h b/version.h
index acc77be0e1..0789df61ed 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-05-04"
-#define RUBY_PATCHLEVEL 182
+#define RUBY_PATCHLEVEL 183
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 5