carto/protobuf @ 5f5efe50c5bef20042645b51a697f58b0704ac89

Joshua Haberman b971243fe0 Merge branch '3.12.x' into merge-release-branch		%!s(int64=5) %!d(string=hai) anos
..
protobuf	b971243fe0 Merge branch '3.12.x' into merge-release-branch	%!s(int64=5) %!d(string=hai) anos
__init__.py	c649397029 Set execute bit on files if and only if they begin with (#!). (#7347)	%!s(int64=5) %!d(string=hai) anos