From 75e4c446a30d89b43eb043c8ef4a421c77fc1b95 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Mon, 1 Jun 2020 16:35:52 -0700
Subject: [PATCH] Added changelog entries for Piper sync.

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 43be322ca2..253e47b4c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,15 @@
 Unreleased Changes
 
   C++:
+  * Removed deprecated unsafe arena string accessors
   * Enabled heterogeneous lookup for std::string keys in maps.
   * Improved the randomness of map ordering.
+  * Removed implicit conversion from StringPiece to std::string
+  * Fix use-after-destroy bug when the Map is allocated in the arena.
+  * Improved the randomness of proto map ordering
 
   Python:
+  * Reject lowercase t for Timestamp json format. Fixes a conformance test.
   * Improved the error message when AttributeError is returned from __getattr__
     in EnumTypeWrapper.