tree c60890a79010e6c1b637e3544e56e976135368bf
parent 63da77bc971e08c2241cc1d9e65ede4bf335c421
author Joshua Haberman <jhaberman@gmail.com> 1589672522 -0700
committer GitHub <noreply@github.com> 1589672522 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJewHpKCRBK7hj4Ov3rIwAAdHIIADPkQq6OaiC07J7GEbiICK+9
 1BOhDezzaedhWRPtbiaFjtIFBIfQNOwMP/PH0Igqw1Mw6zuw2mVh4ML15fWPcbtM
 +dnSAFTDyiJdfdG6CIQnbNpSHndkqdWGQhnqRqbd+YIHoC6EOQU2I1nyfEhSvR90
 ++hFe5WsDgaXtlDb6exKo3SLWPTiklWV5JIoQCce+ud2zgTKcrYJc7wVp7TmrSn9
 kjmsWTI/P8X5Z8NyW1rD/JmDAHlp6LmAgYyvVIiM9PUGSrim8HzyAW+T6QPOmwq6
 V+8IuKl8fXKCWkQtrdidbFRz88fBQA8RWQzH8IndPMyXd+YcdQHXOQ7Nmj5aXG4=
 =uIvC
 -----END PGP SIGNATURE-----
 

Merge release branch into master. (#7517)

* Added background information about proto3 presence. (#7501)

* Fixed bug in map key sorting for Java TextFormat. (#7508)

Fixes: https://github.com/protocolbuffers/protobuf/issues/7505

* Update protobuf version

* Added a changelog entry about the Java fix. (#7516)