Update proto files from upstream.

Using upstream 4fbb0c5eedf5658c5f3fac574b8bb0d3b3664621

Protos/Conformance/editions/test_messages_proto2_editions.proto

@@ -23,6 +23,7 @@ option objc_class_prefix = "EditionsProto2";
 
 // This is the default, but we specify it here explicitly.
 option optimize_for = SPEED;
+option cc_enable_arenas = true;
 
 // This proto includes every type of field in both singular and repeated
 // forms.

Protos/Conformance/editions/test_messages_proto3_editions.proto

@@ -28,6 +28,7 @@ option objc_class_prefix = "EditionsProto3";
 
 // This is the default, but we specify it here explicitly.
 option optimize_for = SPEED;
+option cc_enable_arenas = true;
 
 // This proto includes every type of field in both singular and repeated
 // forms.

Protos/SwiftProtobuf/google/protobuf/api.proto

@@ -166,7 +166,7 @@ message Method {
 // The mixin construct implies that all methods in `AccessControl` are
 // also declared with same name and request/response types in
 // `Storage`. A documentation generator or annotation processor will
-// see the effective `Storage.GetAcl` method after inherting
+// see the effective `Storage.GetAcl` method after inheriting
 // documentation and annotations as follows:
 //
 //     service Storage {

Protos/SwiftProtobuf/google/protobuf/descriptor.proto

@@ -80,7 +80,7 @@ enum Edition {
   EDITION_2024 = 1001;
 
   // Placeholder editions for testing feature resolution.  These should not be
-  // used or relyed on outside of tests.
+  // used or relied on outside of tests.
   EDITION_1_TEST_ONLY = 1;
   EDITION_2_TEST_ONLY = 2;
   EDITION_99997_TEST_ONLY = 99997;

Protos/upstream/editions/golden/test_messages_proto2_editions.proto

@@ -23,6 +23,7 @@ option objc_class_prefix = "EditionsProto2";
 
 // This is the default, but we specify it here explicitly.
 option optimize_for = SPEED;
+option cc_enable_arenas = true;
 
 // This proto includes every type of field in both singular and repeated
 // forms.

Protos/upstream/editions/golden/test_messages_proto3_editions.proto

@@ -28,6 +28,7 @@ option objc_class_prefix = "EditionsProto3";
 
 // This is the default, but we specify it here explicitly.
 option optimize_for = SPEED;
+option cc_enable_arenas = true;
 
 // This proto includes every type of field in both singular and repeated
 // forms.

Protos/upstream/google/protobuf/api.proto

@@ -166,7 +166,7 @@ message Method {
 // The mixin construct implies that all methods in `AccessControl` are
 // also declared with same name and request/response types in
 // `Storage`. A documentation generator or annotation processor will
-// see the effective `Storage.GetAcl` method after inherting
+// see the effective `Storage.GetAcl` method after inheriting
 // documentation and annotations as follows:
 //
 //     service Storage {

Protos/upstream/google/protobuf/descriptor.proto

@@ -80,7 +80,7 @@ enum Edition {
   EDITION_2024 = 1001;
 
   // Placeholder editions for testing feature resolution.  These should not be
-  // used or relyed on outside of tests.
+  // used or relied on outside of tests.
   EDITION_1_TEST_ONLY = 1;
   EDITION_2_TEST_ONLY = 2;
   EDITION_99997_TEST_ONLY = 99997;

Protos/upstream/google/protobuf/edition_unittest.proto

@@ -91,6 +91,7 @@ message TestAllTypes {
 
   string optional_string_piece = 24 [ctype=STRING_PIECE];
   string optional_cord = 25 [ctype=CORD];
+  bytes optional_bytes_cord = 86 [ctype=CORD];
 
   // Defined in unittest_import_public.proto
   protobuf_unittest_import.PublicImportMessage
@@ -266,6 +267,7 @@ extend TestAllExtensions {
   // TODO: ctype=CORD is not supported for extension. Add
   // ctype=CORD option back after it is supported.
   string optional_cord_extension = 25;
+  bytes optional_bytes_cord_extension = 86;
 
   protobuf_unittest_import.PublicImportMessage
     optional_public_import_message_extension = 26;