Merge pull request #7824 from neheb/proto
authorRosen Penev <rosenp@gmail.com>
Sat, 6 Apr 2019 18:18:37 +0000 (11:18 -0700)
committerGitHub <noreply@github.com>
Sat, 6 Apr 2019 18:18:37 +0000 (11:18 -0700)
protobuf: Update to 3.6.1


Trivial merge