@@ -131,7 +131,7 @@ github.com/gogo/googleapis                          08a7655d27152912db7aaf4f9832

 # cluster

 github.com/docker/swarmkit                          59163bf75df38489d4a10392265d27156dc473c5

-github.com/gogo/protobuf                            4cbf7e384e768b4e01799441fdf2a706a5635ae7 # v1.2.0

+github.com/gogo/protobuf                            ba06b47c162d49f2af050fb4c75bcbc86a159d5c # v1.2.1

 github.com/cloudflare/cfssl                         5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2

 github.com/fernet/fernet-go                         1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2

 github.com/google/certificate-transparency-go       37a384cd035e722ea46e55029093e26687138edf # v1.0.20

@@ -29,11 +29,19 @@ To use this software, you must:

 	https://golang.org/doc/install

   for details or, if you are using gccgo, follow the instructions at

 	https://golang.org/doc/install/gccgo

-- Grab the code from the repository and install the proto package.

+- Grab the code from the repository and install the `proto` package.

   The simplest way is to run `go get -u github.com/golang/protobuf/protoc-gen-go`.

-  The compiler plugin, protoc-gen-go, will be installed in $GOBIN,

-  defaulting to $GOPATH/bin.  It must be in your $PATH for the protocol

-  compiler, protoc, to find it.

+  The compiler plugin, `protoc-gen-go`, will be installed in `$GOPATH/bin`

+  unless `$GOBIN` is set. It must be in your `$PATH` for the protocol

+  compiler, `protoc`, to find it.

+- If you need a particular version of `protoc-gen-go` (e.g., to match your

+  `proto` package version), one option is

+  ```shell

+  GIT_TAG="v1.2.0" # change as needed

+  go get -d -u github.com/golang/protobuf/protoc-gen-go

+  git -C "$(go env GOPATH)"/src/github.com/golang/protobuf checkout $GIT_TAG

+  go install github.com/golang/protobuf/protoc-gen-go

+  ```

 This software has two parts: a 'protocol compiler plugin' that

 generates Go source files that, once compiled, can access and manage

@@ -63,7 +63,7 @@ Please let us know if you are using gogoprotobuf by posting on our <a href="http

   - <a href="https://jbrandhorst.com/post/gogoproto/">So you want to use GoGo Protobuf - Johan Brandhorst</a>

   - <a href="https://jbrandhorst.com/post/grpc-errors/">Advanced gRPC Error Usage - Johan Brandhorst</a>

   - <a href="https://www.udemy.com/grpc-golang/?couponCode=GITHUB10">gRPC Golang Course on Udemy - Stephane Maarek</a>

-  

+

 ## Getting Started

 There are several ways to use gogoprotobuf, but for all you need to install go and protoc.

@@ -75,11 +75,11 @@ After that you can choose:

 ### Installation

-To install it, you must first have Go (at least version 1.6.3 or 1.9 if you are using gRPC) installed (see [http://golang.org/doc/install](http://golang.org/doc/install)). 

-Latest patch versions of 1.9 and 1.10 are continuously tested.

+To install it, you must first have Go (at least version 1.6.3 or 1.9 if you are using gRPC) installed (see [http://golang.org/doc/install](http://golang.org/doc/install)).

+Latest patch versions of 1.10 and 1.11 are continuously tested.

 Next, install the standard protocol buffer implementation from [https://github.com/google/protobuf](https://github.com/google/protobuf).

-Most versions from 2.3.1 should not give any problems, but 2.6.1, 3.0.2 and 3.5.1 are continuously tested.

+Most versions from 2.3.1 should not give any problems, but 2.6.1, 3.0.2 and 3.6.1 are continuously tested.

 ### Speed

@@ -156,4 +156,4 @@ See [https://github.com/gogo/grpc-example](https://github.com/gogo/grpc-example)

 This software is licensed under the 3-Clause BSD License

 ("BSD License 2.0", "Revised BSD License", "New BSD License", or "Modified BSD License").

-  

+

@@ -1,12 +1,14 @@

 // Code generated by protoc-gen-gogo. DO NOT EDIT.

 // source: gogo.proto

-package gogoproto // import "github.com/gogo/protobuf/gogoproto"

+package gogoproto

-import proto "github.com/gogo/protobuf/proto"

-import fmt "fmt"

-import math "math"

-import descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"

+import (

+	fmt "fmt"

+	proto "github.com/gogo/protobuf/proto"

+	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"

+	math "math"

+)

 // Reference imports to suppress errors if they are not otherwise used.

 var _ = proto.Marshal

@@ -24,7 +26,7 @@ var E_GoprotoEnumPrefix = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         62001,

 	Name:          "gogoproto.goproto_enum_prefix",

-	Tag:           "varint,62001,opt,name=goproto_enum_prefix,json=goprotoEnumPrefix",

+	Tag:           "varint,62001,opt,name=goproto_enum_prefix",

 	Filename:      "gogo.proto",

 }

@@ -33,7 +35,7 @@ var E_GoprotoEnumStringer = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         62021,

 	Name:          "gogoproto.goproto_enum_stringer",

-	Tag:           "varint,62021,opt,name=goproto_enum_stringer,json=goprotoEnumStringer",

+	Tag:           "varint,62021,opt,name=goproto_enum_stringer",

 	Filename:      "gogo.proto",

 }

@@ -42,7 +44,7 @@ var E_EnumStringer = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         62022,

 	Name:          "gogoproto.enum_stringer",

-	Tag:           "varint,62022,opt,name=enum_stringer,json=enumStringer",

+	Tag:           "varint,62022,opt,name=enum_stringer",

 	Filename:      "gogo.proto",

 }

@@ -51,7 +53,7 @@ var E_EnumCustomname = &proto.ExtensionDesc{

 	ExtensionType: (*string)(nil),

 	Field:         62023,

 	Name:          "gogoproto.enum_customname",

-	Tag:           "bytes,62023,opt,name=enum_customname,json=enumCustomname",

+	Tag:           "bytes,62023,opt,name=enum_customname",

 	Filename:      "gogo.proto",

 }

@@ -69,7 +71,7 @@ var E_EnumvalueCustomname = &proto.ExtensionDesc{

 	ExtensionType: (*string)(nil),

 	Field:         66001,

 	Name:          "gogoproto.enumvalue_customname",

-	Tag:           "bytes,66001,opt,name=enumvalue_customname,json=enumvalueCustomname",

+	Tag:           "bytes,66001,opt,name=enumvalue_customname",

 	Filename:      "gogo.proto",

 }

@@ -78,7 +80,7 @@ var E_GoprotoGettersAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63001,

 	Name:          "gogoproto.goproto_getters_all",

-	Tag:           "varint,63001,opt,name=goproto_getters_all,json=goprotoGettersAll",

+	Tag:           "varint,63001,opt,name=goproto_getters_all",

 	Filename:      "gogo.proto",

 }

@@ -87,7 +89,7 @@ var E_GoprotoEnumPrefixAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63002,

 	Name:          "gogoproto.goproto_enum_prefix_all",

-	Tag:           "varint,63002,opt,name=goproto_enum_prefix_all,json=goprotoEnumPrefixAll",

+	Tag:           "varint,63002,opt,name=goproto_enum_prefix_all",

 	Filename:      "gogo.proto",

 }

@@ -96,7 +98,7 @@ var E_GoprotoStringerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63003,

 	Name:          "gogoproto.goproto_stringer_all",

-	Tag:           "varint,63003,opt,name=goproto_stringer_all,json=goprotoStringerAll",

+	Tag:           "varint,63003,opt,name=goproto_stringer_all",

 	Filename:      "gogo.proto",

 }

@@ -105,7 +107,7 @@ var E_VerboseEqualAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63004,

 	Name:          "gogoproto.verbose_equal_all",

-	Tag:           "varint,63004,opt,name=verbose_equal_all,json=verboseEqualAll",

+	Tag:           "varint,63004,opt,name=verbose_equal_all",

 	Filename:      "gogo.proto",

 }

@@ -114,7 +116,7 @@ var E_FaceAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63005,

 	Name:          "gogoproto.face_all",

-	Tag:           "varint,63005,opt,name=face_all,json=faceAll",

+	Tag:           "varint,63005,opt,name=face_all",

 	Filename:      "gogo.proto",

 }

@@ -123,7 +125,7 @@ var E_GostringAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63006,

 	Name:          "gogoproto.gostring_all",

-	Tag:           "varint,63006,opt,name=gostring_all,json=gostringAll",

+	Tag:           "varint,63006,opt,name=gostring_all",

 	Filename:      "gogo.proto",

 }

@@ -132,7 +134,7 @@ var E_PopulateAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63007,

 	Name:          "gogoproto.populate_all",

-	Tag:           "varint,63007,opt,name=populate_all,json=populateAll",

+	Tag:           "varint,63007,opt,name=populate_all",

 	Filename:      "gogo.proto",

 }

@@ -141,7 +143,7 @@ var E_StringerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63008,

 	Name:          "gogoproto.stringer_all",

-	Tag:           "varint,63008,opt,name=stringer_all,json=stringerAll",

+	Tag:           "varint,63008,opt,name=stringer_all",

 	Filename:      "gogo.proto",

 }

@@ -150,7 +152,7 @@ var E_OnlyoneAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63009,

 	Name:          "gogoproto.onlyone_all",

-	Tag:           "varint,63009,opt,name=onlyone_all,json=onlyoneAll",

+	Tag:           "varint,63009,opt,name=onlyone_all",

 	Filename:      "gogo.proto",

 }

@@ -159,7 +161,7 @@ var E_EqualAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63013,

 	Name:          "gogoproto.equal_all",

-	Tag:           "varint,63013,opt,name=equal_all,json=equalAll",

+	Tag:           "varint,63013,opt,name=equal_all",

 	Filename:      "gogo.proto",

 }

@@ -168,7 +170,7 @@ var E_DescriptionAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63014,

 	Name:          "gogoproto.description_all",

-	Tag:           "varint,63014,opt,name=description_all,json=descriptionAll",

+	Tag:           "varint,63014,opt,name=description_all",

 	Filename:      "gogo.proto",

 }

@@ -177,7 +179,7 @@ var E_TestgenAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63015,

 	Name:          "gogoproto.testgen_all",

-	Tag:           "varint,63015,opt,name=testgen_all,json=testgenAll",

+	Tag:           "varint,63015,opt,name=testgen_all",

 	Filename:      "gogo.proto",

 }

@@ -186,7 +188,7 @@ var E_BenchgenAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63016,

 	Name:          "gogoproto.benchgen_all",

-	Tag:           "varint,63016,opt,name=benchgen_all,json=benchgenAll",

+	Tag:           "varint,63016,opt,name=benchgen_all",

 	Filename:      "gogo.proto",

 }

@@ -195,7 +197,7 @@ var E_MarshalerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63017,

 	Name:          "gogoproto.marshaler_all",

-	Tag:           "varint,63017,opt,name=marshaler_all,json=marshalerAll",

+	Tag:           "varint,63017,opt,name=marshaler_all",

 	Filename:      "gogo.proto",

 }

@@ -204,7 +206,7 @@ var E_UnmarshalerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63018,

 	Name:          "gogoproto.unmarshaler_all",

-	Tag:           "varint,63018,opt,name=unmarshaler_all,json=unmarshalerAll",

+	Tag:           "varint,63018,opt,name=unmarshaler_all",

 	Filename:      "gogo.proto",

 }

@@ -213,7 +215,7 @@ var E_StableMarshalerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63019,

 	Name:          "gogoproto.stable_marshaler_all",

-	Tag:           "varint,63019,opt,name=stable_marshaler_all,json=stableMarshalerAll",

+	Tag:           "varint,63019,opt,name=stable_marshaler_all",

 	Filename:      "gogo.proto",

 }

@@ -222,7 +224,7 @@ var E_SizerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63020,

 	Name:          "gogoproto.sizer_all",

-	Tag:           "varint,63020,opt,name=sizer_all,json=sizerAll",

+	Tag:           "varint,63020,opt,name=sizer_all",

 	Filename:      "gogo.proto",

 }

@@ -231,7 +233,7 @@ var E_GoprotoEnumStringerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63021,

 	Name:          "gogoproto.goproto_enum_stringer_all",

-	Tag:           "varint,63021,opt,name=goproto_enum_stringer_all,json=goprotoEnumStringerAll",

+	Tag:           "varint,63021,opt,name=goproto_enum_stringer_all",

 	Filename:      "gogo.proto",

 }

@@ -240,7 +242,7 @@ var E_EnumStringerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63022,

 	Name:          "gogoproto.enum_stringer_all",

-	Tag:           "varint,63022,opt,name=enum_stringer_all,json=enumStringerAll",

+	Tag:           "varint,63022,opt,name=enum_stringer_all",

 	Filename:      "gogo.proto",

 }

@@ -249,7 +251,7 @@ var E_UnsafeMarshalerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63023,

 	Name:          "gogoproto.unsafe_marshaler_all",

-	Tag:           "varint,63023,opt,name=unsafe_marshaler_all,json=unsafeMarshalerAll",

+	Tag:           "varint,63023,opt,name=unsafe_marshaler_all",

 	Filename:      "gogo.proto",

 }

@@ -258,7 +260,7 @@ var E_UnsafeUnmarshalerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63024,

 	Name:          "gogoproto.unsafe_unmarshaler_all",

-	Tag:           "varint,63024,opt,name=unsafe_unmarshaler_all,json=unsafeUnmarshalerAll",

+	Tag:           "varint,63024,opt,name=unsafe_unmarshaler_all",

 	Filename:      "gogo.proto",

 }

@@ -267,7 +269,7 @@ var E_GoprotoExtensionsMapAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63025,

 	Name:          "gogoproto.goproto_extensions_map_all",

-	Tag:           "varint,63025,opt,name=goproto_extensions_map_all,json=goprotoExtensionsMapAll",

+	Tag:           "varint,63025,opt,name=goproto_extensions_map_all",

 	Filename:      "gogo.proto",

 }

@@ -276,7 +278,7 @@ var E_GoprotoUnrecognizedAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63026,

 	Name:          "gogoproto.goproto_unrecognized_all",

-	Tag:           "varint,63026,opt,name=goproto_unrecognized_all,json=goprotoUnrecognizedAll",

+	Tag:           "varint,63026,opt,name=goproto_unrecognized_all",

 	Filename:      "gogo.proto",

 }

@@ -285,7 +287,7 @@ var E_GogoprotoImport = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63027,

 	Name:          "gogoproto.gogoproto_import",

-	Tag:           "varint,63027,opt,name=gogoproto_import,json=gogoprotoImport",

+	Tag:           "varint,63027,opt,name=gogoproto_import",

 	Filename:      "gogo.proto",

 }

@@ -294,7 +296,7 @@ var E_ProtosizerAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63028,

 	Name:          "gogoproto.protosizer_all",

-	Tag:           "varint,63028,opt,name=protosizer_all,json=protosizerAll",

+	Tag:           "varint,63028,opt,name=protosizer_all",

 	Filename:      "gogo.proto",

 }

@@ -303,7 +305,7 @@ var E_CompareAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63029,

 	Name:          "gogoproto.compare_all",

-	Tag:           "varint,63029,opt,name=compare_all,json=compareAll",

+	Tag:           "varint,63029,opt,name=compare_all",

 	Filename:      "gogo.proto",

 }

@@ -312,7 +314,7 @@ var E_TypedeclAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63030,

 	Name:          "gogoproto.typedecl_all",

-	Tag:           "varint,63030,opt,name=typedecl_all,json=typedeclAll",

+	Tag:           "varint,63030,opt,name=typedecl_all",

 	Filename:      "gogo.proto",

 }

@@ -321,7 +323,7 @@ var E_EnumdeclAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63031,

 	Name:          "gogoproto.enumdecl_all",

-	Tag:           "varint,63031,opt,name=enumdecl_all,json=enumdeclAll",

+	Tag:           "varint,63031,opt,name=enumdecl_all",

 	Filename:      "gogo.proto",

 }

@@ -330,7 +332,7 @@ var E_GoprotoRegistration = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63032,

 	Name:          "gogoproto.goproto_registration",

-	Tag:           "varint,63032,opt,name=goproto_registration,json=goprotoRegistration",

+	Tag:           "varint,63032,opt,name=goproto_registration",

 	Filename:      "gogo.proto",

 }

@@ -339,7 +341,7 @@ var E_MessagenameAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63033,

 	Name:          "gogoproto.messagename_all",

-	Tag:           "varint,63033,opt,name=messagename_all,json=messagenameAll",

+	Tag:           "varint,63033,opt,name=messagename_all",

 	Filename:      "gogo.proto",

 }

@@ -348,7 +350,7 @@ var E_GoprotoSizecacheAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63034,

 	Name:          "gogoproto.goproto_sizecache_all",

-	Tag:           "varint,63034,opt,name=goproto_sizecache_all,json=goprotoSizecacheAll",

+	Tag:           "varint,63034,opt,name=goproto_sizecache_all",

 	Filename:      "gogo.proto",

 }

@@ -357,7 +359,7 @@ var E_GoprotoUnkeyedAll = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         63035,

 	Name:          "gogoproto.goproto_unkeyed_all",

-	Tag:           "varint,63035,opt,name=goproto_unkeyed_all,json=goprotoUnkeyedAll",

+	Tag:           "varint,63035,opt,name=goproto_unkeyed_all",

 	Filename:      "gogo.proto",

 }

@@ -366,7 +368,7 @@ var E_GoprotoGetters = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         64001,

 	Name:          "gogoproto.goproto_getters",

-	Tag:           "varint,64001,opt,name=goproto_getters,json=goprotoGetters",

+	Tag:           "varint,64001,opt,name=goproto_getters",

 	Filename:      "gogo.proto",

 }

@@ -375,7 +377,7 @@ var E_GoprotoStringer = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         64003,

 	Name:          "gogoproto.goproto_stringer",

-	Tag:           "varint,64003,opt,name=goproto_stringer,json=goprotoStringer",

+	Tag:           "varint,64003,opt,name=goproto_stringer",

 	Filename:      "gogo.proto",

 }

@@ -384,7 +386,7 @@ var E_VerboseEqual = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         64004,

 	Name:          "gogoproto.verbose_equal",

-	Tag:           "varint,64004,opt,name=verbose_equal,json=verboseEqual",

+	Tag:           "varint,64004,opt,name=verbose_equal",

 	Filename:      "gogo.proto",

 }

@@ -492,7 +494,7 @@ var E_StableMarshaler = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         64019,

 	Name:          "gogoproto.stable_marshaler",

-	Tag:           "varint,64019,opt,name=stable_marshaler,json=stableMarshaler",

+	Tag:           "varint,64019,opt,name=stable_marshaler",

 	Filename:      "gogo.proto",

 }

@@ -510,7 +512,7 @@ var E_UnsafeMarshaler = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         64023,

 	Name:          "gogoproto.unsafe_marshaler",

-	Tag:           "varint,64023,opt,name=unsafe_marshaler,json=unsafeMarshaler",

+	Tag:           "varint,64023,opt,name=unsafe_marshaler",

 	Filename:      "gogo.proto",

 }

@@ -519,7 +521,7 @@ var E_UnsafeUnmarshaler = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         64024,

 	Name:          "gogoproto.unsafe_unmarshaler",

-	Tag:           "varint,64024,opt,name=unsafe_unmarshaler,json=unsafeUnmarshaler",

+	Tag:           "varint,64024,opt,name=unsafe_unmarshaler",

 	Filename:      "gogo.proto",

 }

@@ -528,7 +530,7 @@ var E_GoprotoExtensionsMap = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         64025,

 	Name:          "gogoproto.goproto_extensions_map",

-	Tag:           "varint,64025,opt,name=goproto_extensions_map,json=goprotoExtensionsMap",

+	Tag:           "varint,64025,opt,name=goproto_extensions_map",

 	Filename:      "gogo.proto",

 }

@@ -537,7 +539,7 @@ var E_GoprotoUnrecognized = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         64026,

 	Name:          "gogoproto.goproto_unrecognized",

-	Tag:           "varint,64026,opt,name=goproto_unrecognized,json=goprotoUnrecognized",

+	Tag:           "varint,64026,opt,name=goproto_unrecognized",

 	Filename:      "gogo.proto",

 }

@@ -582,7 +584,7 @@ var E_GoprotoSizecache = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         64034,

 	Name:          "gogoproto.goproto_sizecache",

-	Tag:           "varint,64034,opt,name=goproto_sizecache,json=goprotoSizecache",

+	Tag:           "varint,64034,opt,name=goproto_sizecache",

 	Filename:      "gogo.proto",

 }

@@ -591,7 +593,7 @@ var E_GoprotoUnkeyed = &proto.ExtensionDesc{

 	ExtensionType: (*bool)(nil),

 	Field:         64035,

 	Name:          "gogoproto.goproto_unkeyed",

-	Tag:           "varint,64035,opt,name=goproto_unkeyed,json=goprotoUnkeyed",

+	Tag:           "varint,64035,opt,name=goproto_unkeyed",

 	Filename:      "gogo.proto",

 }

@@ -782,9 +784,9 @@ func init() {

 	proto.RegisterExtension(E_Wktpointer)

 }

-func init() { proto.RegisterFile("gogo.proto", fileDescriptor_gogo_b95f77e237336c7c) }

+func init() { proto.RegisterFile("gogo.proto", fileDescriptor_592445b5231bc2b9) }

-var fileDescriptor_gogo_b95f77e237336c7c = []byte{

+var fileDescriptor_592445b5231bc2b9 = []byte{

 	// 1328 bytes of a gzipped FileDescriptorProto

 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x98, 0x49, 0x6f, 0x1c, 0x45,

 	0x14, 0x80, 0x85, 0x48, 0x64, 0x4f, 0x79, 0x8b, 0xc7, 0xc6, 0x84, 0x08, 0x44, 0xe0, 0xc4, 0xc9,

@@ -186,7 +186,6 @@ func (p *Buffer) DecodeVarint() (x uint64, err error) {

 	if b&0x80 == 0 {

 		goto done

 	}

-	// x -= 0x80 << 63 // Always zero.

 	return 0, errOverflow

new file mode 100644

@@ -0,0 +1,63 @@

+// Go support for Protocol Buffers - Google's data interchange format

+//

+// Copyright 2018 The Go Authors.  All rights reserved.

+// https://github.com/golang/protobuf

+//

+// Redistribution and use in source and binary forms, with or without

+// modification, are permitted provided that the following conditions are

+// met:

+//

+//     * Redistributions of source code must retain the above copyright

+// notice, this list of conditions and the following disclaimer.

+//     * Redistributions in binary form must reproduce the above

+// copyright notice, this list of conditions and the following disclaimer

+// in the documentation and/or other materials provided with the

+// distribution.

+//     * Neither the name of Google Inc. nor the names of its

+// contributors may be used to endorse or promote products derived from

+// this software without specific prior written permission.

+//

+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+package proto

+

+import "errors"

+

+// Deprecated: do not use.

+type Stats struct{ Emalloc, Dmalloc, Encode, Decode, Chit, Cmiss, Size uint64 }

+

+// Deprecated: do not use.

+func GetStats() Stats { return Stats{} }

+

+// Deprecated: do not use.

+func MarshalMessageSet(interface{}) ([]byte, error) {

+	return nil, errors.New("proto: not implemented")

+}

+

+// Deprecated: do not use.

+func UnmarshalMessageSet([]byte, interface{}) error {

+	return errors.New("proto: not implemented")

+}

+

+// Deprecated: do not use.

+func MarshalMessageSetJSON(interface{}) ([]byte, error) {

+	return nil, errors.New("proto: not implemented")

+}

+

+// Deprecated: do not use.

+func UnmarshalMessageSetJSON([]byte, interface{}) error {

+	return errors.New("proto: not implemented")

+}

+

+// Deprecated: do not use.

+func RegisterMessageSetType(Message, int32, string) {}

@@ -544,7 +544,7 @@ func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error

 	}

 	typ := reflect.TypeOf(extension.ExtensionType)

 	if typ != reflect.TypeOf(value) {

-		return errors.New("proto: bad extension value type")

+		return fmt.Errorf("proto: bad extension value type. got: %T, want: %T", value, extension.ExtensionType)

 	}

 	// nil extension values need to be caught early, because the

 	// encoder can't distinguish an ErrNil due to a nil extension

@@ -341,26 +341,6 @@ type Message interface {

 	ProtoMessage()

 }

-// Stats records allocation details about the protocol buffer encoders

-// and decoders.  Useful for tuning the library itself.

-type Stats struct {

-	Emalloc uint64 // mallocs in encode

-	Dmalloc uint64 // mallocs in decode

-	Encode  uint64 // number of encodes

-	Decode  uint64 // number of decodes

-	Chit    uint64 // number of cache hits

-	Cmiss   uint64 // number of cache misses

-	Size    uint64 // number of sizes

-}

-

-// Set to true to enable stats collection.

-const collectStats = false

-

-var stats Stats

-

-// GetStats returns a copy of the global Stats structure.

-func GetStats() Stats { return stats }

-

 // A Buffer is a buffer manager for marshaling and unmarshaling

 // protocol buffers.  It may be reused between invocations to

 // reduce memory usage.  It is not necessary to use a Buffer;

@@ -36,13 +36,7 @@ package proto

  */

 import (

-	"bytes"

-	"encoding/json"

 	"errors"

-	"fmt"

-	"reflect"

-	"sort"

-	"sync"

 )

 // errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.

@@ -145,46 +139,9 @@ func skipVarint(buf []byte) []byte {

 	return buf[i+1:]

 }

-// MarshalMessageSet encodes the extension map represented by m in the message set wire format.

-// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.

-func MarshalMessageSet(exts interface{}) ([]byte, error) {

-	return marshalMessageSet(exts, false)

-}

-

-// marshaMessageSet implements above function, with the opt to turn on / off deterministic during Marshal.

-func marshalMessageSet(exts interface{}, deterministic bool) ([]byte, error) {

-	switch exts := exts.(type) {

-	case *XXX_InternalExtensions:

-		var u marshalInfo

-		siz := u.sizeMessageSet(exts)

-		b := make([]byte, 0, siz)

-		return u.appendMessageSet(b, exts, deterministic)

-

-	case map[int32]Extension:

-		// This is an old-style extension map.

-		// Wrap it in a new-style XXX_InternalExtensions.

-		ie := XXX_InternalExtensions{

-			p: &struct {

-				mu           sync.Mutex

-				extensionMap map[int32]Extension

-			}{

-				extensionMap: exts,

-			},

-		}

-

-		var u marshalInfo

-		siz := u.sizeMessageSet(&ie)

-		b := make([]byte, 0, siz)

-		return u.appendMessageSet(b, &ie, deterministic)

-

-	default:

-		return nil, errors.New("proto: not an extension map")

-	}

-}

-

-// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.

+// unmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.

 // It is called by Unmarshal methods on protocol buffer messages with the message_set_wire_format option.

-func UnmarshalMessageSet(buf []byte, exts interface{}) error {

+func unmarshalMessageSet(buf []byte, exts interface{}) error {

 	var m map[int32]Extension

 	switch exts := exts.(type) {

 	case *XXX_InternalExtensions:

@@ -222,93 +179,3 @@ func UnmarshalMessageSet(buf []byte, exts interface{}) error {

 	}

 	return nil

 }

-

-// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.

-// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.

-func MarshalMessageSetJSON(exts interface{}) ([]byte, error) {

-	var m map[int32]Extension

-	switch exts := exts.(type) {

-	case *XXX_InternalExtensions:

-		var mu sync.Locker

-		m, mu = exts.extensionsRead()

-		if m != nil {

-			// Keep the extensions map locked until we're done marshaling to prevent

-			// races between marshaling and unmarshaling the lazily-{en,de}coded

-			// values.

-			mu.Lock()

-			defer mu.Unlock()

-		}

-	case map[int32]Extension:

-		m = exts

-	default:

-		return nil, errors.New("proto: not an extension map")

-	}

-	var b bytes.Buffer

-	b.WriteByte('{')

-

-	// Process the map in key order for deterministic output.

-	ids := make([]int32, 0, len(m))

-	for id := range m {

-		ids = append(ids, id)

-	}

-	sort.Sort(int32Slice(ids)) // int32Slice defined in text.go

-

-	for i, id := range ids {

-		ext := m[id]

-		msd, ok := messageSetMap[id]

-		if !ok {

-			// Unknown type; we can't render it, so skip it.

-			continue

-		}

-

-		if i > 0 && b.Len() > 1 {

-			b.WriteByte(',')

-		}

-

-		fmt.Fprintf(&b, `"[%s]":`, msd.name)

-

-		x := ext.value

-		if x == nil {

-			x = reflect.New(msd.t.Elem()).Interface()

-			if err := Unmarshal(ext.enc, x.(Message)); err != nil {

-				return nil, err

-			}

-		}

-		d, err := json.Marshal(x)

-		if err != nil {

-			return nil, err

-		}

-		b.Write(d)

-	}

-	b.WriteByte('}')

-	return b.Bytes(), nil

-}

-

-// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.

-// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.

-func UnmarshalMessageSetJSON(buf []byte, exts interface{}) error {

-	// Common-case fast path.

-	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {

-		return nil

-	}

-

-	// This is fairly tricky, and it's not clear that it is needed.

-	return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")

-}

-

-// A global registry of types that can be used in a MessageSet.

-

-var messageSetMap = make(map[int32]messageSetDesc)

-

-type messageSetDesc struct {

-	t    reflect.Type // pointer to struct

-	name string

-}

-

-// RegisterMessageSetType is called from the generated code.

-func RegisterMessageSetType(m Message, fieldNum int32, name string) {

-	messageSetMap[fieldNum] = messageSetDesc{

-		t:    reflect.TypeOf(m),

-		name: name,

-	}

-}

@@ -391,9 +391,6 @@ func GetProperties(t reflect.Type) *StructProperties {

 	sprop, ok := propertiesMap[t]

 	propertiesMu.RUnlock()

 	if ok {

-		if collectStats {

-			stats.Chit++

-		}

 		return sprop

 	}

@@ -406,14 +403,8 @@ func GetProperties(t reflect.Type) *StructProperties {

 // getPropertiesLocked requires that propertiesMu is held.

 func getPropertiesLocked(t reflect.Type) *StructProperties {

 	if prop, ok := propertiesMap[t]; ok {

-		if collectStats {

-			stats.Chit++

-		}

 		return prop

 	}

-	if collectStats {

-		stats.Cmiss++

-	}

 	prop := new(StructProperties)

 	// in case of recursive protos, fill this in now.

@@ -491,7 +491,7 @@ func (fi *marshalFieldInfo) computeMarshalFieldInfo(f *reflect.StructField) {

 func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofImplementers []interface{}) {

 	fi.field = toField(f)

-	fi.wiretag = 1<<31 - 1 // Use a large tag number, make oneofs sorted at the end. This tag will not appear on the wire.

+	fi.wiretag = math.MaxInt32 // Use a large tag number, make oneofs sorted at the end. This tag will not appear on the wire.

 	fi.isPointer = true

 	fi.sizer, fi.marshaler = makeOneOfMarshaler(fi, f)

 	fi.oneofElems = make(map[reflect.Type]*marshalElemInfo)

@@ -138,7 +138,7 @@ func (u *unmarshalInfo) unmarshal(m pointer, b []byte) error {

 		u.computeUnmarshalInfo()

 	}

 	if u.isMessageSet {

-		return UnmarshalMessageSet(b, m.offset(u.extensions).toExtensions())

+		return unmarshalMessageSet(b, m.offset(u.extensions).toExtensions())

 	}

 	var reqMask uint64 // bitmask of required fields we've seen.

 	var errLater error

@@ -2142,7 +2142,7 @@ func encodeVarint(b []byte, x uint64) []byte {

 // If there is an error, it returns 0,0.

 func decodeVarint(b []byte) (uint64, int) {

 	var x, y uint64

-	if len(b) <= 0 {

+	if len(b) == 0 {

 		goto bad

 	}

 	x = uint64(b[0])

@@ -121,7 +121,8 @@ option objc_class_prefix = "GPB";

 //

 message Any {

   // A URL/resource name that uniquely identifies the type of the serialized

-  // protocol buffer message. The last segment of the URL's path must represent

+  // protocol buffer message. This string must contain at least

+  // one "/" character. The last segment of the URL's path must represent

   // the fully qualified name of the type (as in

   // `path/google.protobuf.Duration`). The name should be in a canonical form

   // (e.g., leading "." is not accepted).

@@ -417,6 +417,17 @@ message FileOptions {

   // determining the namespace.

   optional string php_namespace = 41;

+

+  // Use this option to change the namespace of php generated metadata classes.

+  // Default is empty. When this option is empty, the proto file name will be used

+  // for determining the namespace.

+  optional string php_metadata_namespace = 44;

+

+  // Use this option to change the package of ruby generated classes. Default

+  // is empty. When this option is not set, the package name will be used for

+  // determining the ruby package.

+  optional string ruby_package = 45;

+

   // The parser stores options it doesn't recognize here.

   // See the documentation for the "Options" section above.

   repeated UninterpretedOption uninterpreted_option = 999;

@@ -38,6 +38,7 @@ option java_outer_classname = "FieldMaskProto";

 option java_multiple_files = true;

 option objc_class_prefix = "GPB";

 option go_package = "types";

+option cc_enable_arenas = true;

 // `FieldMask` represents a set of symbolic field paths, for example:

 //

@@ -107,57 +108,49 @@ option go_package = "types";

 // describe the updated values, the API ignores the values of all

 // fields not covered by the mask.

 //

-// If a repeated field is specified for an update operation, the existing

-// repeated values in the target resource will be overwritten by the new values.