From 3fff95e1bd59209a17cd6e3f7e0218eacb35cd88 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Fri, 23 Oct 2020 11:04:54 -0700
Subject: [PATCH] Updated changelog.

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index e02fa98c97..a4d2ac0622 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@ Unreleased Changes
   * The proto compiler no longer requires a .proto filename when it is not
     generating code.
   * Added flag `--deterministic_output` to `protoc --encode=...`.
+  * Fixed deadlock when using google.protobuf.Any embedded in aggregate options.
 
   C++
   * Arenas are now unconditionally enabled. cc_enable_arenas no longer has
@@ -25,6 +26,8 @@ Unreleased Changes
   * Fix a crash in BuildFile when passing in invalid descriptor proto.
   * Parser security fix when operating with CodedInputStream.
   * Warn against the use of AllowUnknownExtension.
+  * Migrated to C++11 for-range loops instead of index-based loops where
+    possible. This fixes a lot of warnings when compiling with -Wsign-compare.
 
   Java
   * Bugfix in mergeFrom() when a oneof has multiple message fields.
@@ -32,6 +35,9 @@ Unreleased Changes
     0 bytes when not at EOF.
   * Redefine remove(Object) on primitive repeated field Lists to avoid
     autoboxing.
+  * Support "\u" escapes in textformat string literals.
+  * Trailing empty spaces are no longer ignored for FieldMask.
+  * Fix FieldMaskUtil.subtract to recursively remove mask.
 
   Python
   * Print google.protobuf.NullValue as null instead of "NULL_VALUE" when it is