Update vendored gotapdance

vendor/github.com/refraction-networking/gotapdance/protobuf/signalling.pb.go

@@ -724,6 +724,7 @@ type RegistrationFlags struct {
 	DarkDecoy            *bool    `protobuf:"varint,2,opt,name=dark_decoy,json=darkDecoy" json:"dark_decoy,omitempty"`
 	ProxyHeader          *bool    `protobuf:"varint,3,opt,name=proxy_header,json=proxyHeader" json:"proxy_header,omitempty"`
 	Use_TIL              *bool    `protobuf:"varint,4,opt,name=use_TIL,json=useTIL" json:"use_TIL,omitempty"`
+	Prescanned           *bool    `protobuf:"varint,5,opt,name=prescanned" json:"prescanned,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -782,6 +783,13 @@ func (m *RegistrationFlags) GetUse_TIL() bool {
 	return false
 }
 
+func (m *RegistrationFlags) GetPrescanned() bool {
+	if m != nil && m.Prescanned != nil {
+		return *m.Prescanned
+	}
+	return false
+}
+
 type ClientToStation struct {
 	ProtocolVersion *uint32 `protobuf:"varint,1,opt,name=protocol_version,json=protocolVersion" json:"protocol_version,omitempty"`
 	// The client reports its decoy list's version number here, which the
@@ -935,112 +943,79 @@ func (m *ClientToStation) GetPadding() []byte {
 	return nil
 }
 
-// Message type used as the request body when registering via the HTTP API.
-// This message is assumed to be sent via TLS, meaning that sending the secret outright is acceptable.
-type ClientToAPI struct {
-	// The secret that will be used when forming phantom connections.
-	Secret []byte `protobuf:"bytes,1,opt,name=secret" json:"secret,omitempty"`
-	// The ClientToStation payload; the same as used in decoy registrations.
-	RegistrationPayload  *ClientToStation `protobuf:"bytes,2,opt,name=registration_payload,json=registrationPayload" json:"registration_payload,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
-	XXX_unrecognized     []byte           `json:"-"`
-	XXX_sizecache        int32            `json:"-"`
+type C2SWrapper struct {
+	SharedSecret        []byte              `protobuf:"bytes,1,opt,name=shared_secret,json=sharedSecret" json:"shared_secret,omitempty"`
+	RegistrationPayload *ClientToStation    `protobuf:"bytes,3,opt,name=registration_payload,json=registrationPayload" json:"registration_payload,omitempty"`
+	RegistrationSource  *RegistrationSource `protobuf:"varint,4,opt,name=registration_source,json=registrationSource,enum=tapdance.RegistrationSource" json:"registration_source,omitempty"`
+	// client source address when receiving a registration
+	RegistrationAddress []byte `protobuf:"bytes,6,opt,name=registration_address,json=registrationAddress" json:"registration_address,omitempty"`
+	// Decoy address used when registering over Decoy registrar
+	DecoyAddress         []byte   `protobuf:"bytes,7,opt,name=decoy_address,json=decoyAddress" json:"decoy_address,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ClientToAPI) Reset()         { *m = ClientToAPI{} }
-func (m *ClientToAPI) String() string { return proto.CompactTextString(m) }
-func (*ClientToAPI) ProtoMessage()    {}
-func (*ClientToAPI) Descriptor() ([]byte, []int) {
+func (m *C2SWrapper) Reset()         { *m = C2SWrapper{} }
+func (m *C2SWrapper) String() string { return proto.CompactTextString(m) }
+func (*C2SWrapper) ProtoMessage()    {}
+func (*C2SWrapper) Descriptor() ([]byte, []int) {
 	return fileDescriptor_39f66308029891ad, []int{8}
 }
 
-func (m *ClientToAPI) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ClientToAPI.Unmarshal(m, b)
+func (m *C2SWrapper) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_C2SWrapper.Unmarshal(m, b)
 }
-func (m *ClientToAPI) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ClientToAPI.Marshal(b, m, deterministic)
+func (m *C2SWrapper) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_C2SWrapper.Marshal(b, m, deterministic)
 }
-func (m *ClientToAPI) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ClientToAPI.Merge(m, src)
+func (m *C2SWrapper) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_C2SWrapper.Merge(m, src)
 }
-func (m *ClientToAPI) XXX_Size() int {
-	return xxx_messageInfo_ClientToAPI.Size(m)
+func (m *C2SWrapper) XXX_Size() int {
+	return xxx_messageInfo_C2SWrapper.Size(m)
 }
-func (m *ClientToAPI) XXX_DiscardUnknown() {
-	xxx_messageInfo_ClientToAPI.DiscardUnknown(m)
+func (m *C2SWrapper) XXX_DiscardUnknown() {
+	xxx_messageInfo_C2SWrapper.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_ClientToAPI proto.InternalMessageInfo
+var xxx_messageInfo_C2SWrapper proto.InternalMessageInfo
 
-func (m *ClientToAPI) GetSecret() []byte {
+func (m *C2SWrapper) GetSharedSecret() []byte {
 	if m != nil {
-		return m.Secret
+		return m.SharedSecret
 	}
 	return nil
 }
 
-func (m *ClientToAPI) GetRegistrationPayload() *ClientToStation {
+func (m *C2SWrapper) GetRegistrationPayload() *ClientToStation {
 	if m != nil {
 		return m.RegistrationPayload
 	}
 	return nil
 }
 
-type ZMQPayload struct {
-	SharedSecret         []byte              `protobuf:"bytes,1,opt,name=shared_secret,json=sharedSecret" json:"shared_secret,omitempty"`
-	RegistrationPayload  *ClientToStation    `protobuf:"bytes,3,opt,name=registration_payload,json=registrationPayload" json:"registration_payload,omitempty"`
-	RegistrationSource   *RegistrationSource `protobuf:"varint,4,opt,name=registration_source,json=registrationSource,enum=tapdance.RegistrationSource" json:"registration_source,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
-	XXX_unrecognized     []byte              `json:"-"`
-	XXX_sizecache        int32               `json:"-"`
-}
-
-func (m *ZMQPayload) Reset()         { *m = ZMQPayload{} }
-func (m *ZMQPayload) String() string { return proto.CompactTextString(m) }
-func (*ZMQPayload) ProtoMessage()    {}
-func (*ZMQPayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_39f66308029891ad, []int{9}
-}
-
-func (m *ZMQPayload) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ZMQPayload.Unmarshal(m, b)
-}
-func (m *ZMQPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ZMQPayload.Marshal(b, m, deterministic)
-}
-func (m *ZMQPayload) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ZMQPayload.Merge(m, src)
-}
-func (m *ZMQPayload) XXX_Size() int {
-	return xxx_messageInfo_ZMQPayload.Size(m)
-}
-func (m *ZMQPayload) XXX_DiscardUnknown() {
-	xxx_messageInfo_ZMQPayload.DiscardUnknown(m)
+func (m *C2SWrapper) GetRegistrationSource() RegistrationSource {
+	if m != nil && m.RegistrationSource != nil {
+		return *m.RegistrationSource
+	}
+	return RegistrationSource_Detector
 }
 
-var xxx_messageInfo_ZMQPayload proto.InternalMessageInfo
-
-func (m *ZMQPayload) GetSharedSecret() []byte {
+func (m *C2SWrapper) GetRegistrationAddress() []byte {
 	if m != nil {
-		return m.SharedSecret
+		return m.RegistrationAddress
 	}
 	return nil
 }
 
-func (m *ZMQPayload) GetRegistrationPayload() *ClientToStation {
+func (m *C2SWrapper) GetDecoyAddress() []byte {
 	if m != nil {
-		return m.RegistrationPayload
+		return m.DecoyAddress
 	}
 	return nil
 }
 
-func (m *ZMQPayload) GetRegistrationSource() RegistrationSource {
-	if m != nil && m.RegistrationSource != nil {
-		return *m.RegistrationSource
-	}
-	return RegistrationSource_Detector
-}
-
 type SessionStats struct {
 	FailedDecoysAmount *uint32 `protobuf:"varint,20,opt,name=failed_decoys_amount,json=failedDecoysAmount" json:"failed_decoys_amount,omitempty"`
 	// Applicable to whole session:
@@ -1058,7 +1033,7 @@ func (m *SessionStats) Reset()         { *m = SessionStats{} }
 func (m *SessionStats) String() string { return proto.CompactTextString(m) }
 func (*SessionStats) ProtoMessage()    {}
 func (*SessionStats) Descriptor() ([]byte, []int) {
-	return fileDescriptor_39f66308029891ad, []int{10}
+	return fileDescriptor_39f66308029891ad, []int{9}
 }
 
 func (m *SessionStats) XXX_Unmarshal(b []byte) error {
@@ -1129,102 +1104,102 @@ func init() {
 	proto.RegisterType((*StationToClient)(nil), "tapdance.StationToClient")
 	proto.RegisterType((*RegistrationFlags)(nil), "tapdance.RegistrationFlags")
 	proto.RegisterType((*ClientToStation)(nil), "tapdance.ClientToStation")
-	proto.RegisterType((*ClientToAPI)(nil), "tapdance.ClientToAPI")
-	proto.RegisterType((*ZMQPayload)(nil), "tapdance.ZMQPayload")
+	proto.RegisterType((*C2SWrapper)(nil), "tapdance.C2SWrapper")
 	proto.RegisterType((*SessionStats)(nil), "tapdance.SessionStats")
 }
 
 func init() { proto.RegisterFile("signalling.proto", fileDescriptor_39f66308029891ad) }
 
 var fileDescriptor_39f66308029891ad = []byte{
-	// 1416 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x72, 0xdb, 0xc6,
-	0x15, 0x36, 0xf4, 0x4b, 0x1e, 0xfe, 0x41, 0xab, 0x3f, 0xb8, 0xb6, 0x6b, 0x99, 0xad, 0x5b, 0x59,
-	0x6d, 0x3d, 0x35, 0x47, 0x92, 0x7b, 0x59, 0x1a, 0x82, 0x6d, 0x8e, 0x29, 0x82, 0x5e, 0xc0, 0x9e,
-	0xda, 0xbd, 0xd8, 0x81, 0x80, 0xa5, 0x8c, 0x08, 0xc2, 0x62, 0xb0, 0x4b, 0x25, 0x7c, 0x8a, 0xdc,
-	0x26, 0xef, 0x90, 0x67, 0xc8, 0x0b, 0x78, 0x26, 0x6f, 0x90, 0xeb, 0x3c, 0x46, 0x32, 0xbb, 0x0b,
-	0x92, 0xa0, 0xe4, 0x38, 0x93, 0xdc, 0xf1, 0x7c, 0xe7, 0x9c, 0x3d, 0x7f, 0xdf, 0x39, 0x20, 0x98,
-	0x3c, 0x3e, 0x4f, 0x83, 0x24, 0x89, 0xd3, 0xf3, 0xc7, 0x59, 0xce, 0x04, 0x43, 0x15, 0x11, 0x64,
-	0x51, 0x90, 0x86, 0xb4, 0xdd, 0x85, 0xb5, 0xe1, 0xf8, 0xec, 0x15, 0x9d, 0x20, 0x13, 0x96, 0x2f,
-	0xe8, 0xc4, 0x32, 0xf6, 0x8c, 0xfd, 0x3a, 0x96, 0x3f, 0xd1, 0x43, 0x58, 0x11, 0x93, 0x8c, 0x5a,
-	0x4b, 0x7b, 0xc6, 0x7e, 0xb3, 0xb3, 0xf1, 0x78, 0xea, 0xf4, 0xf8, 0x15, 0x9d, 0xf8, 0x93, 0x8c,
-	0x62, 0xa5, 0x6e, 0x7f, 0x6f, 0x40, 0xdd, 0xef, 0x7b, 0x27, 0x34, 0x64, 0x13, 0x2f, 0xa3, 0x21,
-	0xfa, 0x13, 0x54, 0x3e, 0x30, 0x2e, 0xd2, 0xe0, 0x92, 0xaa, 0xe7, 0xaa, 0x78, 0x26, 0x4b, 0x5d,
-	0x9c, 0x5d, 0x1d, 0x06, 0x51, 0x94, 0xab, 0x77, 0xd7, 0xf1, 0x4c, 0x2e, 0x74, 0xc7, 0x4a, 0xb7,
-	0xa6, 0xd2, 0x98, 0xc9, 0x68, 0x1f, 0xd6, 0xb2, 0xf1, 0x99, 0x4c, 0x70, 0x79, 0xcf, 0xd8, 0xaf,
-	0x75, 0xcc, 0x79, 0x36, 0x3a, 0x7f, 0x5c, 0xe8, 0x91, 0x05, 0xeb, 0x22, 0xbe, 0xa4, 0x6c, 0x2c,
-	0xac, 0x95, 0x3d, 0x63, 0xbf, 0x81, 0xa7, 0x22, 0xda, 0x81, 0x35, 0x11, 0x66, 0x5f, 0xc6, 0xa9,
-	0xb5, 0xaa, 0x14, 0x85, 0xd4, 0xfe, 0x76, 0x09, 0xc0, 0x4e, 0x62, 0x9a, 0x0a, 0x9b, 0xa5, 0x23,
-	0xd4, 0x01, 0x88, 0x64, 0x2d, 0x24, 0x89, 0xb9, 0x50, 0x05, 0xd4, 0x3a, 0x9b, 0xf3, 0x70, 0xaa,
-	0xce, 0x7e, 0xcc, 0x05, 0xae, 0x46, 0xd3, 0x9f, 0xe8, 0xcf, 0x00, 0xe7, 0x34, 0xa5, 0x79, 0x20,
-	0x62, 0x96, 0xaa, 0xc2, 0x1a, 0xb8, 0x84, 0xa0, 0xa7, 0xd0, 0x8c, 0xe8, 0x28, 0x18, 0x27, 0x82,
-	0xfc, 0x46, 0x19, 0x8d, 0xc2, 0x6e, 0xa8, 0xab, 0x71, 0x60, 0x23, 0x0a, 0xf2, 0x0b, 0xa2, 0x33,
-	0x3a, 0x4b, 0x58, 0x78, 0xc1, 0x55, 0x5d, 0xb5, 0xce, 0xed, 0x52, 0x4e, 0x41, 0x7e, 0xa1, 0xf2,
-	0x7a, 0xa6, 0x0c, 0x70, 0x2b, 0x5a, 0x04, 0x64, 0xfc, 0x90, 0xa5, 0x5f, 0x8c, 0x73, 0x3a, 0x8d,
-	0xbf, 0xfa, 0x6b, 0xf1, 0x0b, 0x3b, 0x1d, 0xbf, 0xfd, 0x0c, 0xaa, 0xb3, 0x82, 0xd1, 0x11, 0x80,
-	0x48, 0xb8, 0xce, 0x85, 0x5b, 0xc6, 0xde, 0xf2, 0x7e, 0xad, 0xb3, 0x33, 0x7f, 0xa1, 0x4c, 0x02,
-	0x5c, 0x15, 0x09, 0x57, 0x12, 0x6f, 0x3f, 0x82, 0xd6, 0xb5, 0x04, 0xe5, 0x28, 0x8a, 0x5a, 0xe4,
-	0x2b, 0x55, 0x5c, 0x48, 0xed, 0x8f, 0x4b, 0xd0, 0xf2, 0x84, 0xea, 0x99, 0xcf, 0xf4, 0x4c, 0xd0,
-	0x23, 0x30, 0x15, 0x6b, 0x43, 0x96, 0x90, 0x2b, 0x9a, 0x73, 0xd9, 0x61, 0x43, 0x75, 0xb8, 0x35,
-	0xc5, 0xdf, 0x6a, 0x18, 0xd9, 0x60, 0x72, 0x11, 0x08, 0x4a, 0x44, 0x1e, 0xa4, 0x3c, 0x9e, 0x0d,
-	0xa3, 0xd9, 0xb1, 0xe6, 0x69, 0x7a, 0x1d, 0x9b, 0xf8, 0x33, 0x3d, 0x6e, 0x29, 0x8f, 0x39, 0x80,
-	0x8e, 0xa0, 0x16, 0xb2, 0x74, 0x14, 0x9f, 0x93, 0x38, 0x1d, 0xb1, 0x62, 0x50, 0x5b, 0x73, 0xff,
-	0x39, 0x55, 0x30, 0x68, 0xc3, 0x5e, 0x3a, 0x62, 0xe8, 0x29, 0x00, 0xcd, 0x73, 0x92, 0xd3, 0x80,
-	0xb3, 0x54, 0x8d, 0x68, 0x21, 0xaa, 0x93, 0xe7, 0x2c, 0xc7, 0x4a, 0xe9, 0x75, 0x6c, 0x5c, 0xa5,
-	0x79, 0x21, 0xa1, 0xfb, 0x50, 0x13, 0x97, 0x19, 0x39, 0x0b, 0xc2, 0x0b, 0x36, 0x1a, 0x15, 0xdc,
-	0x04, 0x71, 0x99, 0x3d, 0xd3, 0x08, 0xba, 0x07, 0xc0, 0x75, 0x4f, 0x48, 0x1c, 0xa9, 0xcd, 0xa8,
-	0xe2, 0x6a, 0x81, 0xf4, 0x22, 0x49, 0xf8, 0x2c, 0x88, 0xa2, 0x38, 0x3d, 0xb7, 0x22, 0xb5, 0x35,
-	0x53, 0xb1, 0xfd, 0xb5, 0x01, 0x1b, 0x98, 0x9e, 0xc7, 0x5c, 0x68, 0x1a, 0x3e, 0x4f, 0x82, 0x73,
-	0x2e, 0xe3, 0x8d, 0xb3, 0x84, 0x05, 0x11, 0x61, 0x69, 0xa2, 0x17, 0xbe, 0x82, 0x41, 0x43, 0x6e,
-	0x9a, 0x4c, 0x64, 0xbc, 0x39, 0xe7, 0x54, 0xff, 0x2a, 0xb8, 0x3a, 0x63, 0x14, 0x7a, 0x00, 0xf5,
-	0x2c, 0x67, 0x5f, 0x4d, 0xc8, 0x07, 0x1a, 0x44, 0x34, 0x57, 0x0d, 0xaa, 0xe0, 0x9a, 0xc2, 0x5e,
-	0x2a, 0x08, 0xed, 0xc2, 0xfa, 0x98, 0x53, 0xe2, 0xf7, 0xfa, 0xaa, 0x11, 0x15, 0xbc, 0x36, 0xe6,
-	0xd4, 0xef, 0xf5, 0xdb, 0x1f, 0x57, 0xa0, 0xa5, 0xfb, 0xe7, 0xb3, 0x62, 0xce, 0xbf, 0x67, 0xbe,
-	0x1d, 0xd8, 0x9e, 0xaf, 0x26, 0xb9, 0xb1, 0x71, 0x9b, 0xb3, 0x85, 0x7c, 0x31, 0x5f, 0xbd, 0x4f,
-	0x71, 0x62, 0xf9, 0xfa, 0x74, 0xec, 0x8e, 0xf7, 0x59, 0x4e, 0xcc, 0x7b, 0xc6, 0x27, 0x69, 0xa8,
-	0x8a, 0x5a, 0x99, 0xf6, 0xcc, 0x9b, 0xa4, 0x21, 0xfa, 0x0b, 0x34, 0x46, 0x41, 0x9c, 0xd0, 0x68,
-	0xba, 0x1d, 0xa0, 0x78, 0x5d, 0xd7, 0xa0, 0x5e, 0x04, 0xf4, 0x4f, 0x58, 0x95, 0x0f, 0x73, 0xab,
-	0xa6, 0x38, 0x55, 0x5a, 0x1d, 0x8f, 0x72, 0x59, 0xa0, 0x6c, 0x09, 0xc7, 0xda, 0x08, 0x1d, 0x41,
-	0x55, 0xa5, 0x9c, 0xb1, 0x5c, 0x58, 0x75, 0x95, 0xf1, 0x6e, 0x69, 0xd9, 0xa6, 0x2a, 0x75, 0x89,
-	0xe7, 0x96, 0xe8, 0xa1, 0x5c, 0xf5, 0x2b, 0x9a, 0x0b, 0x22, 0x0f, 0x27, 0xe5, 0xdc, 0xda, 0x52,
-	0x8c, 0x69, 0x68, 0xb4, 0xab, 0x41, 0xf4, 0x14, 0xac, 0xcb, 0x80, 0x5f, 0x4c, 0x13, 0x26, 0x9c,
-	0xe6, 0x57, 0x34, 0x27, 0xea, 0x68, 0x6f, 0x2b, 0x87, 0x6d, 0xad, 0xd7, 0x2b, 0xad, 0xb4, 0x03,
-	0x79, 0xc1, 0xef, 0x01, 0x5c, 0x1d, 0x13, 0x3e, 0xce, 0x54, 0x5e, 0x3b, 0x9a, 0x1d, 0x57, 0xc7,
-	0x9e, 0x06, 0x94, 0xfa, 0x70, 0xa6, 0xde, 0x2d, 0xd4, 0x87, 0x53, 0xf5, 0x13, 0x58, 0x1d, 0x49,
-	0x16, 0x5a, 0x96, 0x6a, 0xc1, 0x9d, 0x79, 0x41, 0x37, 0x88, 0x8a, 0xb5, 0xe5, 0x67, 0xf8, 0xcd,
-	0xa1, 0x36, 0x25, 0x53, 0x77, 0xd8, 0x93, 0x47, 0x85, 0xd3, 0x30, 0xa7, 0xa2, 0xf8, 0x88, 0x15,
-	0x12, 0xea, 0xc3, 0x56, 0x5e, 0x7a, 0x9c, 0x64, 0xc1, 0x44, 0xce, 0x4d, 0x91, 0x66, 0xe1, 0x8c,
-	0x5e, 0x63, 0x26, 0xde, 0x2c, 0xbb, 0x0d, 0xb5, 0x57, 0xfb, 0x07, 0x03, 0xe0, 0xfd, 0xe9, 0xeb,
-	0x42, 0x94, 0x83, 0xe7, 0x1f, 0x82, 0x9c, 0x46, 0x64, 0x21, 0x76, 0x5d, 0x83, 0xde, 0xe7, 0x33,
-	0x58, 0xfe, 0x23, 0x19, 0xa0, 0x53, 0x58, 0x80, 0x09, 0x67, 0xe3, 0x3c, 0xa4, 0xc5, 0xc9, 0xb9,
-	0xfb, 0xe9, 0x8e, 0x7a, 0xca, 0x06, 0xa3, 0xfc, 0x06, 0xd6, 0xfe, 0xd1, 0x80, 0x7a, 0x99, 0x7f,
-	0xe8, 0xdf, 0xb0, 0xb5, 0xc0, 0x65, 0x12, 0x5c, 0xb2, 0x71, 0x2a, 0x14, 0x8f, 0x1a, 0x18, 0x95,
-	0x29, 0xdd, 0x55, 0x1a, 0xf4, 0x04, 0xb6, 0x05, 0x13, 0x41, 0x42, 0xe4, 0xa7, 0x96, 0x08, 0x46,
-	0x42, 0x96, 0xa6, 0x34, 0x14, 0xd6, 0x7d, 0xed, 0xa2, 0x94, 0x7e, 0x7c, 0x49, 0x7d, 0x66, 0x6b,
-	0x0d, 0xfa, 0x2b, 0x34, 0x73, 0x21, 0xa4, 0x6d, 0x71, 0xc9, 0xac, 0x07, 0xca, 0xb6, 0x9e, 0x8b,
-	0xd2, 0x6d, 0xd8, 0x83, 0xba, 0xfc, 0xe2, 0x08, 0x56, 0x1c, 0xa3, 0xbf, 0x15, 0xc7, 0x31, 0xe1,
-	0x3e, 0xd3, 0xd7, 0x48, 0x5a, 0x84, 0xd9, 0xdc, 0xe2, 0xef, 0x85, 0x45, 0x98, 0x15, 0x16, 0x07,
-	0xff, 0x80, 0xf5, 0xe2, 0x0f, 0x0b, 0x6a, 0x41, 0xad, 0xeb, 0x78, 0xe4, 0x85, 0x7d, 0x4a, 0x9e,
-	0x74, 0xfe, 0x63, 0xbe, 0x2f, 0x03, 0x9d, 0xa3, 0x63, 0xf3, 0xff, 0x07, 0x3f, 0x19, 0xd0, 0x5c,
-	0x3c, 0x06, 0x68, 0x03, 0x1a, 0x12, 0x19, 0xb8, 0xc4, 0x7e, 0xd9, 0x1d, 0xbc, 0x70, 0xcc, 0x5b,
-	0x68, 0x0b, 0x4c, 0x09, 0x79, 0x8e, 0xe7, 0xf5, 0xdc, 0x01, 0xe9, 0x0d, 0x7a, 0xbe, 0x69, 0xa0,
-	0x3b, 0xb0, 0x5b, 0x46, 0x6d, 0xf7, 0xad, 0x83, 0x7d, 0xad, 0xac, 0x21, 0x0b, 0xb6, 0xa4, 0xd2,
-	0xf9, 0xdf, 0xd0, 0xb1, 0x7d, 0x82, 0x1d, 0xdb, 0x1d, 0x0c, 0x1c, 0xdb, 0x37, 0x97, 0xd0, 0x36,
-	0x6c, 0x2c, 0xb8, 0xf5, 0x5d, 0xcf, 0x31, 0x97, 0xa7, 0x31, 0xde, 0xf5, 0x9c, 0xfe, 0x09, 0x79,
-	0x33, 0xec, 0xbb, 0xdd, 0x13, 0x73, 0x05, 0xed, 0x00, 0x92, 0x68, 0xd7, 0x7e, 0xfd, 0xa6, 0x87,
-	0x9d, 0x29, 0xbe, 0x8a, 0xf6, 0xe0, 0x6e, 0xe9, 0x79, 0x0d, 0xbb, 0x83, 0xfe, 0xbb, 0x22, 0x92,
-	0xb9, 0x86, 0x9a, 0x50, 0x55, 0x16, 0x18, 0xbb, 0xd8, 0xfc, 0xd9, 0x38, 0xf8, 0xc6, 0x80, 0xe6,
-	0xe2, 0xa7, 0x50, 0x56, 0x2a, 0x91, 0x6b, 0x95, 0x4a, 0xe8, 0x66, 0xa5, 0x65, 0x74, 0xb1, 0xd2,
-	0xdb, 0xb0, 0x2d, 0x95, 0xb6, 0x3b, 0x78, 0xde, 0xc3, 0xa7, 0xd7, 0x4b, 0x5d, 0xf0, 0x2b, 0x4a,
-	0x6d, 0x42, 0x55, 0xc2, 0xb3, 0xd4, 0xbe, 0x33, 0xa0, 0xb9, 0xf8, 0xbd, 0x44, 0x75, 0xa8, 0x0c,
-	0xdc, 0xc2, 0xe2, 0x96, 0x1a, 0x89, 0x8e, 0xe9, 0xf9, 0xd8, 0xe9, 0x9e, 0x9a, 0x06, 0xda, 0x84,
-	0x96, 0xdd, 0xef, 0x39, 0x03, 0xd9, 0xdb, 0xa1, 0x8b, 0x7d, 0xe7, 0xc4, 0x5c, 0x2a, 0x81, 0x43,
-	0xec, 0xfa, 0xae, 0xed, 0xf6, 0x75, 0x63, 0x3d, 0xbf, 0xeb, 0xeb, 0x72, 0x7c, 0x07, 0x0f, 0xba,
-	0x7d, 0x73, 0x05, 0x21, 0x68, 0x9e, 0x38, 0xb6, 0xfb, 0x8e, 0xc8, 0x77, 0x8b, 0xa6, 0xca, 0x30,
-	0xda, 0xbd, 0x08, 0x13, 0x49, 0xb3, 0x02, 0xf2, 0x7b, 0xa7, 0x8e, 0xfb, 0xc6, 0x37, 0xe9, 0xc1,
-	0xbf, 0xa0, 0xb1, 0x70, 0x8d, 0x51, 0x05, 0x56, 0x06, 0xe3, 0x24, 0x31, 0x6f, 0xa1, 0x75, 0x58,
-	0x3e, 0x8d, 0x53, 0xd3, 0x40, 0x55, 0x58, 0x75, 0xcf, 0x46, 0xfc, 0xd0, 0x5c, 0x3a, 0xf8, 0x2f,
-	0xa0, 0x9b, 0x9b, 0x29, 0x0b, 0x3c, 0xa1, 0x82, 0x86, 0x82, 0xe5, 0xda, 0xaf, 0x3b, 0xec, 0xe9,
-	0xb2, 0xa6, 0xf0, 0x30, 0xa7, 0x3c, 0x0c, 0x52, 0x73, 0xe9, 0x97, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x36, 0x89, 0xb8, 0x79, 0xd1, 0x0b, 0x00, 0x00,
+	// 1435 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xdd, 0x76, 0xdb, 0x40,
+	0x11, 0xae, 0xf2, 0x6b, 0x8f, 0xff, 0x94, 0xcd, 0x9f, 0x4a, 0x5b, 0x9a, 0xba, 0x14, 0xd2, 0x00,
+	0x3d, 0xc4, 0x27, 0x49, 0xb9, 0xc4, 0x55, 0xd4, 0xd6, 0xa7, 0x8e, 0x65, 0x56, 0x6a, 0xa1, 0x70,
+	0xb1, 0x47, 0x91, 0xd6, 0xa9, 0x88, 0x22, 0xe9, 0xec, 0xae, 0x03, 0x7e, 0x13, 0x78, 0x01, 0xae,
+	0x38, 0x87, 0x37, 0xe0, 0x05, 0xfa, 0x0c, 0x5c, 0xf3, 0x18, 0x70, 0x76, 0x57, 0xb2, 0xe5, 0xa4,
+	0x94, 0xc3, 0x9d, 0xf7, 0x9b, 0x59, 0xcd, 0x7c, 0x33, 0xdf, 0xcc, 0x1a, 0x4c, 0x1e, 0x5f, 0xa5,
+	0x41, 0x92, 0xc4, 0xe9, 0xd5, 0xab, 0x9c, 0x65, 0x22, 0x43, 0x35, 0x11, 0xe4, 0x51, 0x90, 0x86,
+	0xb4, 0xdb, 0x87, 0x8d, 0xf1, 0xf4, 0xf2, 0x03, 0x9d, 0x21, 0x13, 0x56, 0xaf, 0xe9, 0xcc, 0x32,
+	0x0e, 0x8c, 0xc3, 0x26, 0x96, 0x3f, 0xd1, 0x0b, 0x58, 0x13, 0xb3, 0x9c, 0x5a, 0x2b, 0x07, 0xc6,
+	0x61, 0xbb, 0xb7, 0xf5, 0xaa, 0xbc, 0xf4, 0xea, 0x03, 0x9d, 0xf9, 0xb3, 0x9c, 0x62, 0x65, 0xee,
+	0xfe, 0xc3, 0x80, 0xa6, 0x3f, 0xf4, 0xce, 0x69, 0x98, 0xcd, 0xbc, 0x9c, 0x86, 0xe8, 0x07, 0x50,
+	0xfb, 0x92, 0x71, 0x91, 0x06, 0x37, 0x54, 0x7d, 0xae, 0x8e, 0xe7, 0x67, 0x69, 0x8b, 0xf3, 0xdb,
+	0x93, 0x20, 0x8a, 0x98, 0xfa, 0xee, 0x26, 0x9e, 0x9f, 0x0b, 0xdb, 0x99, 0xb2, 0x6d, 0xa8, 0x34,
+	0xe6, 0x67, 0x74, 0x08, 0x1b, 0xf9, 0xf4, 0x52, 0x26, 0xb8, 0x7a, 0x60, 0x1c, 0x36, 0x7a, 0xe6,
+	0x22, 0x1b, 0x9d, 0x3f, 0x2e, 0xec, 0xc8, 0x82, 0x4d, 0x11, 0xdf, 0xd0, 0x6c, 0x2a, 0xac, 0xb5,
+	0x03, 0xe3, 0xb0, 0x85, 0xcb, 0x23, 0xda, 0x83, 0x0d, 0x11, 0xe6, 0x7f, 0x8c, 0x53, 0x6b, 0x5d,
+	0x19, 0x8a, 0x53, 0xf7, 0x2f, 0x2b, 0x00, 0x76, 0x12, 0xd3, 0x54, 0xd8, 0x59, 0x3a, 0x41, 0x3d,
+	0x80, 0x48, 0x72, 0x21, 0x49, 0xcc, 0x85, 0x22, 0xd0, 0xe8, 0x6d, 0x2f, 0xc2, 0x29, 0x9e, 0xc3,
+	0x98, 0x0b, 0x5c, 0x8f, 0xca, 0x9f, 0xe8, 0x87, 0x00, 0x57, 0x34, 0xa5, 0x2c, 0x10, 0x71, 0x96,
+	0x2a, 0x62, 0x2d, 0x5c, 0x41, 0xd0, 0x6b, 0x68, 0x47, 0x74, 0x12, 0x4c, 0x13, 0x41, 0xfe, 0x07,
+	0x8d, 0x56, 0xe1, 0x37, 0xd6, 0x6c, 0x1c, 0xd8, 0x8a, 0x02, 0x76, 0x4d, 0x74, 0x46, 0x97, 0x49,
+	0x16, 0x5e, 0x73, 0xc5, 0xab, 0xd1, 0x7b, 0x58, 0xc9, 0x29, 0x60, 0xd7, 0x2a, 0xaf, 0x37, 0xca,
+	0x01, 0x77, 0xa2, 0x65, 0x40, 0xc6, 0x0f, 0xb3, 0xf4, 0x0f, 0x53, 0x46, 0xcb, 0xf8, 0xeb, 0xff,
+	0x2d, 0x7e, 0xe1, 0xa7, 0xe3, 0x77, 0xdf, 0x40, 0x7d, 0x4e, 0x18, 0x9d, 0x02, 0x88, 0x84, 0xeb,
+	0x5c, 0xb8, 0x65, 0x1c, 0xac, 0x1e, 0x36, 0x7a, 0x7b, 0x8b, 0x2f, 0x54, 0x45, 0x80, 0xeb, 0x22,
+	0xe1, 0xea, 0xc4, 0xbb, 0x2f, 0xa1, 0x73, 0x27, 0x41, 0xd9, 0x8a, 0x82, 0x8b, 0xfc, 0x4a, 0x1d,
+	0x17, 0xa7, 0xee, 0xd7, 0x15, 0xe8, 0x78, 0x42, 0xd5, 0xcc, 0xcf, 0x74, 0x4f, 0xd0, 0x4b, 0x30,
+	0x95, 0x6a, 0xc3, 0x2c, 0x21, 0xb7, 0x94, 0x71, 0x59, 0x61, 0x43, 0x55, 0xb8, 0x53, 0xe2, 0x9f,
+	0x34, 0x8c, 0x6c, 0x30, 0xb9, 0x08, 0x04, 0x25, 0x82, 0x05, 0x29, 0x8f, 0xe7, 0xcd, 0x68, 0xf7,
+	0xac, 0x45, 0x9a, 0x5e, 0xcf, 0x26, 0xfe, 0xdc, 0x8e, 0x3b, 0xea, 0xc6, 0x02, 0x40, 0xa7, 0xd0,
+	0x08, 0xb3, 0x74, 0x12, 0x5f, 0x91, 0x38, 0x9d, 0x64, 0x45, 0xa3, 0x76, 0x16, 0xf7, 0x17, 0x52,
+	0xc1, 0xa0, 0x1d, 0x07, 0xe9, 0x24, 0x43, 0xaf, 0x01, 0x28, 0x63, 0x84, 0xd1, 0x80, 0x67, 0xa9,
+	0x6a, 0xd1, 0x52, 0x54, 0x87, 0xb1, 0x8c, 0x61, 0x65, 0xf4, 0x7a, 0x36, 0xae, 0x53, 0x56, 0x9c,
+	0xd0, 0x53, 0x68, 0x88, 0x9b, 0x9c, 0x5c, 0x06, 0xe1, 0x75, 0x36, 0x99, 0x14, 0xda, 0x04, 0x71,
+	0x93, 0xbf, 0xd1, 0x08, 0x7a, 0x02, 0xc0, 0x75, 0x4d, 0x48, 0x1c, 0xa9, 0xc9, 0xa8, 0xe3, 0x7a,
+	0x81, 0x0c, 0x22, 0x29, 0xf8, 0x3c, 0x88, 0xa2, 0x38, 0xbd, 0xb2, 0x22, 0x35, 0x35, 0xe5, 0xb1,
+	0xfb, 0x77, 0x03, 0xb6, 0x30, 0xbd, 0x8a, 0xb9, 0xd0, 0x32, 0x7c, 0x9b, 0x04, 0x57, 0x5c, 0xc6,
+	0x9b, 0xe6, 0x49, 0x16, 0x44, 0x24, 0x4b, 0x13, 0x3d, 0xf0, 0x35, 0x0c, 0x1a, 0x72, 0xd3, 0x64,
+	0x26, 0xe3, 0x2d, 0x34, 0xa7, 0xea, 0x57, 0xc3, 0xf5, 0xb9, 0xa2, 0xd0, 0x33, 0x68, 0xe6, 0x2c,
+	0xfb, 0xd3, 0x8c, 0x7c, 0xa1, 0x41, 0x44, 0x99, 0x2a, 0x50, 0x0d, 0x37, 0x14, 0xf6, 0x5e, 0x41,
+	0x68, 0x1f, 0x36, 0xa7, 0x9c, 0x12, 0x7f, 0x30, 0x54, 0x85, 0xa8, 0xe1, 0x8d, 0x29, 0xa7, 0xfe,
+	0x60, 0x28, 0xe7, 0x24, 0x67, 0x94, 0x87, 0x41, 0x9a, 0xd2, 0x48, 0x51, 0xad, 0xe1, 0x0a, 0xd2,
+	0xfd, 0xba, 0x06, 0x1d, 0x5d, 0x5f, 0x3f, 0x2b, 0x74, 0xf0, 0xff, 0xf4, 0xbf, 0x07, 0xbb, 0x8b,
+	0xd1, 0x25, 0xf7, 0x26, 0x72, 0x7b, 0x3e, 0xb0, 0xef, 0x16, 0xa3, 0xf9, 0x2d, 0xcd, 0xac, 0xde,
+	0xed, 0x9e, 0xdd, 0xf3, 0xbe, 0xab, 0x99, 0x45, 0x4d, 0xf9, 0x2c, 0x0d, 0x15, 0xe9, 0xb5, 0xb2,
+	0xa6, 0xde, 0x2c, 0x0d, 0xd1, 0x73, 0x68, 0x4d, 0x82, 0x38, 0xa1, 0x51, 0x39, 0x3d, 0xa0, 0x74,
+	0xdf, 0xd4, 0xa0, 0x1e, 0x14, 0xf4, 0x33, 0x58, 0x97, 0x1f, 0xe6, 0x56, 0x43, 0x69, 0xae, 0x32,
+	0x5a, 0x1e, 0xe5, 0x92, 0xa0, 0x2c, 0x09, 0xc7, 0xda, 0x09, 0x9d, 0x42, 0x5d, 0xa5, 0x9c, 0x67,
+	0x4c, 0x58, 0x4d, 0x95, 0xf1, 0x7e, 0x65, 0x18, 0x4b, 0x93, 0xda, 0xd4, 0x0b, 0x4f, 0xf4, 0x42,
+	0xae, 0x82, 0x5b, 0xca, 0x04, 0x91, 0x8b, 0x95, 0x72, 0x6e, 0xed, 0x28, 0x45, 0xb5, 0x34, 0xda,
+	0xd7, 0x20, 0x7a, 0x0d, 0xd6, 0x4d, 0xc0, 0xaf, 0xcb, 0x84, 0x09, 0xa7, 0xec, 0x96, 0x32, 0xa2,
+	0x96, 0xfa, 0xae, 0xba, 0xb0, 0xab, 0xed, 0x7a, 0xe4, 0x95, 0x75, 0x24, 0x37, 0xfc, 0x13, 0x80,
+	0xdb, 0x33, 0xc2, 0xa7, 0xb9, 0xca, 0x6b, 0x4f, 0xab, 0xe7, 0xf6, 0xcc, 0xd3, 0x80, 0x32, 0x9f,
+	0xcc, 0xcd, 0xfb, 0x85, 0xf9, 0xa4, 0x34, 0x1f, 0xc3, 0xfa, 0x44, 0xaa, 0xd4, 0xb2, 0x54, 0x09,
+	0x1e, 0x2d, 0x08, 0xdd, 0x13, 0x32, 0xd6, 0x9e, 0xdf, 0xd1, 0xff, 0x5f, 0xe5, 0x62, 0xef, 0x79,
+	0xbf, 0x61, 0x41, 0x9e, 0x53, 0x26, 0x7b, 0xc0, 0xbf, 0x04, 0x8c, 0x46, 0x84, 0xd3, 0x90, 0x51,
+	0x51, 0xbc, 0x75, 0x4d, 0x0d, 0x7a, 0x0a, 0x43, 0x43, 0xd8, 0x61, 0x95, 0x48, 0x24, 0x0f, 0x66,
+	0xb2, 0x89, 0xc5, 0x1a, 0x78, 0x78, 0x77, 0x0d, 0xcc, 0x65, 0x8a, 0xb7, 0xab, 0xd7, 0xc6, 0xfa,
+	0x16, 0xba, 0x80, 0x25, 0x98, 0xf0, 0x6c, 0xca, 0x42, 0x5a, 0x6c, 0x87, 0xc7, 0xdf, 0x26, 0xe7,
+	0x29, 0x1f, 0x8c, 0xd8, 0x3d, 0x0c, 0x1d, 0xdf, 0x49, 0xae, 0xec, 0xa0, 0x7e, 0x2d, 0x97, 0x42,
+	0x95, 0x7d, 0x7c, 0x0e, 0x2d, 0xdd, 0xc0, 0xd2, 0x77, 0x53, 0x93, 0x56, 0x60, 0xe1, 0xd4, 0xfd,
+	0xa7, 0x01, 0xcd, 0xaa, 0xc4, 0xd0, 0x2f, 0x60, 0x67, 0x49, 0xae, 0x24, 0xb8, 0xc9, 0xa6, 0xa9,
+	0x50, 0x52, 0x69, 0x61, 0x54, 0x55, 0x6d, 0x5f, 0x59, 0xd0, 0x31, 0xec, 0x8a, 0x4c, 0x04, 0x09,
+	0x91, 0xaf, 0x2d, 0x11, 0x19, 0x09, 0xb3, 0x34, 0xa5, 0xa1, 0xb0, 0x9e, 0xea, 0x2b, 0xca, 0xe8,
+	0xc7, 0x37, 0xd4, 0xcf, 0x6c, 0x6d, 0x41, 0x3f, 0x82, 0x36, 0x13, 0x42, 0xfa, 0x16, 0xcb, 0xcc,
+	0x7a, 0xa6, 0x7c, 0x9b, 0x4c, 0x54, 0xc6, 0xff, 0x00, 0x9a, 0xf2, 0xd1, 0x11, 0x59, 0xb1, 0x8f,
+	0x7e, 0x5c, 0xec, 0xc7, 0x84, 0xfb, 0x99, 0x5e, 0x48, 0xd2, 0x23, 0xcc, 0x17, 0x1e, 0x3f, 0x29,
+	0x3c, 0xc2, 0xbc, 0xf0, 0x38, 0xfa, 0x29, 0x6c, 0x16, 0xff, 0x59, 0x50, 0x07, 0x1a, 0x7d, 0xc7,
+	0x23, 0xef, 0xec, 0x0b, 0x72, 0xdc, 0xfb, 0xa5, 0xf9, 0xbb, 0x2a, 0xd0, 0x3b, 0x3d, 0x33, 0x7f,
+	0x7f, 0xf4, 0x2f, 0x03, 0xda, 0xcb, 0xf3, 0x8e, 0xb6, 0xa0, 0x25, 0x91, 0x91, 0x4b, 0xec, 0xf7,
+	0xfd, 0xd1, 0x3b, 0xc7, 0x7c, 0x80, 0x76, 0xc0, 0x94, 0x90, 0xe7, 0x78, 0xde, 0xc0, 0x1d, 0x91,
+	0xc1, 0x68, 0xe0, 0x9b, 0x06, 0x7a, 0x04, 0xfb, 0x55, 0xd4, 0x76, 0x3f, 0x39, 0xd8, 0xd7, 0xc6,
+	0x06, 0xb2, 0x60, 0x47, 0x1a, 0x9d, 0xdf, 0x8e, 0x1d, 0xdb, 0x27, 0xd8, 0xb1, 0xdd, 0xd1, 0xc8,
+	0xb1, 0x7d, 0x73, 0x05, 0xed, 0xc2, 0xd6, 0xd2, 0xb5, 0xa1, 0xeb, 0x39, 0xe6, 0x6a, 0x19, 0xe3,
+	0xf3, 0xc0, 0x19, 0x9e, 0x93, 0x8f, 0xe3, 0xa1, 0xdb, 0x3f, 0x37, 0xd7, 0xd0, 0x1e, 0x20, 0x89,
+	0xf6, 0xed, 0x5f, 0x7f, 0x1c, 0x60, 0xa7, 0xc4, 0xd7, 0xd1, 0x01, 0x3c, 0xae, 0x7c, 0x5e, 0xc3,
+	0xee, 0x68, 0xf8, 0xb9, 0x88, 0x64, 0x6e, 0xa0, 0x36, 0xd4, 0x95, 0x07, 0xc6, 0x2e, 0x36, 0xff,
+	0x6d, 0x1c, 0xfd, 0xd9, 0x80, 0xf6, 0xf2, 0x6b, 0x28, 0x99, 0x4a, 0xe4, 0x0e, 0x53, 0x09, 0xdd,
+	0x67, 0x5a, 0x45, 0x97, 0x99, 0x3e, 0x84, 0x5d, 0x69, 0xb4, 0xdd, 0xd1, 0xdb, 0x01, 0xbe, 0xb8,
+	0x4b, 0x75, 0xe9, 0x5e, 0x41, 0xb5, 0x0d, 0x75, 0x09, 0xcf, 0x53, 0xfb, 0x9b, 0x01, 0xed, 0xe5,
+	0x27, 0x13, 0x35, 0xa1, 0x36, 0x72, 0x0b, 0x8f, 0x07, 0xaa, 0x25, 0x3a, 0xa6, 0xe7, 0x63, 0xa7,
+	0x7f, 0x61, 0x1a, 0x68, 0x1b, 0x3a, 0xf6, 0x70, 0xe0, 0x8c, 0x64, 0x6d, 0xc7, 0x2e, 0xf6, 0x9d,
+	0x73, 0x73, 0xa5, 0x02, 0x8e, 0xb1, 0xeb, 0xbb, 0xb6, 0x3b, 0xd4, 0x85, 0xf5, 0xfc, 0xbe, 0xaf,
+	0xe9, 0xf8, 0x0e, 0x1e, 0xf5, 0x87, 0xe6, 0x1a, 0x42, 0xd0, 0x3e, 0x77, 0x6c, 0xf7, 0x33, 0x91,
+	0xdf, 0x2d, 0x8a, 0x2a, 0xc3, 0xe8, 0xeb, 0x45, 0x98, 0x48, 0xba, 0x15, 0x90, 0x3f, 0xb8, 0x70,
+	0xdc, 0x8f, 0xbe, 0x49, 0x8f, 0x7e, 0x0e, 0xad, 0xa5, 0x85, 0x8b, 0x6a, 0xb0, 0x36, 0x9a, 0x26,
+	0x89, 0xf9, 0x00, 0x6d, 0xc2, 0xea, 0x45, 0x9c, 0x9a, 0x06, 0xaa, 0xc3, 0xba, 0x7b, 0x39, 0xe1,
+	0x27, 0xe6, 0xca, 0xd1, 0xaf, 0x00, 0xdd, 0x9f, 0x78, 0x49, 0xf0, 0x9c, 0x0a, 0x1a, 0x8a, 0x8c,
+	0xe9, 0x7b, 0xfd, 0xf1, 0x40, 0xd3, 0x2a, 0xe1, 0xb1, 0x7e, 0x29, 0xcd, 0x95, 0xff, 0x04, 0x00,
+	0x00, 0xff, 0xff, 0xe3, 0x30, 0x4c, 0x88, 0xd4, 0x0b, 0x00, 0x00,
 }

vendor/github.com/refraction-networking/gotapdance/protobuf/signalling.proto

@@ -167,7 +167,8 @@ message RegistrationFlags {
 	optional bool upload_only = 1;
 	optional bool dark_decoy = 2;
 	optional bool proxy_header = 3;
-	optional bool use_TIL = 4;
+    optional bool use_TIL = 4;
+    optional bool prescanned = 5;
 }
 
 message ClientToStation {
@@ -216,15 +217,6 @@ message ClientToStation {
     optional bytes padding = 100;
 }
 
-// Message type used as the request body when registering via the HTTP API.
-// This message is assumed to be sent via TLS, meaning that sending the secret outright is acceptable.
-message ClientToAPI {
-    // The secret that will be used when forming phantom connections.
-    optional bytes secret = 1;
-
-    // The ClientToStation payload; the same as used in decoy registrations.
-    optional ClientToStation registration_payload = 2;
-}
 
 enum RegistrationSource {
 	Detector = 0;
@@ -232,10 +224,16 @@ enum RegistrationSource {
     DetectorPrescan = 2;
 }
 
-message ZMQPayload {
+message C2SWrapper {
 	optional bytes shared_secret = 1;
 	optional ClientToStation registration_payload = 3;
-	optional RegistrationSource registration_source = 4;
+    optional RegistrationSource registration_source = 4;
+    
+    // client source address when receiving a registration
+    optional bytes registration_address = 6;
+
+    // Decoy address used when registering over Decoy registrar
+    optional bytes decoy_address = 7;
 }
 
 message SessionStats {

vendor/github.com/refraction-networking/gotapdance/tapdance/conjure.go

@@ -193,8 +193,8 @@ func (r APIRegistrar) Register(cjSession *ConjureSession, ctx context.Context) (
 
 	c2s := reg.generateClientToStation()
 
-	protoPayload := pb.ClientToAPI{
-		Secret:              cjSession.Keys.SharedSecret,
+	protoPayload := pb.C2SWrapper{
+		SharedSecret:        cjSession.Keys.SharedSecret,
 		RegistrationPayload: c2s,
 	}
 

vendor/vendor.json

@@ -552,38 +552,38 @@
 		{
 			"checksumSHA1": "TtIN/5Wshp+L7WdSLIRLlH+QzYI=",
 			"path": "github.com/refraction-networking/gotapdance",
-			"revision": "00010e1cc7b42e059fa97a0465103d83ae4fa902",
-			"revisionTime": "2020-12-09T19:52:13Z"
+			"revision": "74051a40dbbb06cb0558ccb00dfe03c3f8f4a6a6",
+			"revisionTime": "2020-12-11T19:02:02Z"
 		},
 		{
 			"checksumSHA1": "ObZZJpjQl2BISlIiES82BW8jbEE=",
 			"path": "github.com/refraction-networking/gotapdance/ed25519/edwards25519",
-			"revision": "00010e1cc7b42e059fa97a0465103d83ae4fa902",
-			"revisionTime": "2020-12-09T19:52:13Z"
+			"revision": "74051a40dbbb06cb0558ccb00dfe03c3f8f4a6a6",
+			"revisionTime": "2020-12-11T19:02:02Z"
 		},
 		{
 			"checksumSHA1": "VoyDh1KIIVE+OJbehDNJ91tf4Vw=",
 			"path": "github.com/refraction-networking/gotapdance/ed25519/extra25519",
-			"revision": "00010e1cc7b42e059fa97a0465103d83ae4fa902",
-			"revisionTime": "2020-12-09T19:52:13Z"
+			"revision": "74051a40dbbb06cb0558ccb00dfe03c3f8f4a6a6",
+			"revisionTime": "2020-12-11T19:02:02Z"
 		},
 		{
-			"checksumSHA1": "5PHRWm/HbwpycYDHj6u6rQCoazg=",
+			"checksumSHA1": "HV1A1VNKaVd2yHQmzhy05WJ4JNY=",
 			"path": "github.com/refraction-networking/gotapdance/protobuf",
-			"revision": "00010e1cc7b42e059fa97a0465103d83ae4fa902",
-			"revisionTime": "2020-12-09T19:52:13Z"
+			"revision": "74051a40dbbb06cb0558ccb00dfe03c3f8f4a6a6",
+			"revisionTime": "2020-12-11T19:02:02Z"
 		},
 		{
-			"checksumSHA1": "kACahtrgVCA9nOe3kwBc7bu9+Rk=",
+			"checksumSHA1": "4BHfngLYV4TDRnjnW2h8dRHmjH8=",
 			"path": "github.com/refraction-networking/gotapdance/tapdance",
-			"revision": "00010e1cc7b42e059fa97a0465103d83ae4fa902",
-			"revisionTime": "2020-12-09T19:52:13Z"
+			"revision": "74051a40dbbb06cb0558ccb00dfe03c3f8f4a6a6",
+			"revisionTime": "2020-12-11T19:02:02Z"
 		},
 		{
 			"checksumSHA1": "fv2fYuM1BN+zb4/TEktcVTqKhnI=",
 			"path": "github.com/refraction-networking/gotapdance/tapdance/phantoms",
-			"revision": "00010e1cc7b42e059fa97a0465103d83ae4fa902",
-			"revisionTime": "2020-12-09T19:52:13Z"
+			"revision": "74051a40dbbb06cb0558ccb00dfe03c3f8f4a6a6",
+			"revisionTime": "2020-12-11T19:02:02Z"
 		},
 		{
 			"checksumSHA1": "OagdWaWcbCBQZR5bBGgGaK3nddE=",