Leonhard Reichenbach 2b64047e07 Updated protobuf and py-protobuf to version 3.6.1 (#9536) ...

* Updated protobuf and py-protobuf to version 3.6.1

also updated the download link as the repository has moved

* protobuf: modified conflict

2018-11-15 16:59:04 +01:00

..

package.py

…