nagachika	2013-05-05 00:00:17 +0900 (Sun, 05 May 2013)

  New Revision: 40576

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40576

  Log:
    merge revision(s) 40574:
    
    * doc/security.rdoc: Add note about reporting security vulns

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/doc/security.rdoc
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/doc/security.rdoc
===================================================================
--- ruby_2_0_0/doc/security.rdoc	(revision 40575)
+++ ruby_2_0_0/doc/security.rdoc	(revision 40576)
@@ -10,6 +10,11 @@ Please check the full list of publicly k https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/doc/security.rdoc#L10
 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@r... ({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
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40575)
+++ ruby_2_0_0/ChangeLog	(revision 40576)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat May  4 23:48:56 2013  Zachary Scott  <zachary@z...>
+
+	* doc/security.rdoc: Add note about reporting security vulns
+
 Sat May  4 23:44:54 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* object.c (rb_obj_is_kind_of): skip prepending modules.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40575)
+++ ruby_2_0_0/version.h	(revision 40576)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40574


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/