Update vendored gotapdance and embedded ClientConf

vendor/github.com/refraction-networking/gotapdance/README.md

@@ -4,7 +4,7 @@
 
 <p align="center">Refraction Networking is a free-to-use anti-censorship technology, that places proxies at Internet Service Providers, so they are harder to block. This client includes support for both the TapDance and Conjure protocols</p>
 <p align="center">
-<a href="https://travis-ci.org/refraction-networking/gotapdance"><img src="https://travis-ci.org/refraction-networking/gotapdance.svg?branch=master"></a>
+<a href="https://travis-ci.com/refraction-networking/gotapdance"><img src="https://travis-ci.com/refraction-networking/gotapdance.svg?branch=master"></a>
 <a href="https://godoc.org/github.com/refraction-networking/gotapdance/tapdance"><img src="https://img.shields.io/badge/godoc-reference-blue.svg"></a>
 	<a href="https://goreportcard.com/report/github.com/refraction-networking/gotapdance"><img src="https://goreportcard.com/badge/github.com/refraction-networking/gotapdance"></a>
 </p>

vendor/github.com/refraction-networking/gotapdance/protobuf/Makefile

@@ -0,0 +1,3 @@
+
+all:
+	protoc --go_out=import_path=tdproto:. signalling.proto

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

@@ -478,14 +478,14 @@ func (m *TLSDecoySpec) GetTcpwin() uint32 {
 }
 
 type ClientConf struct {
-	DecoyList            *DecoyList       `protobuf:"bytes,1,opt,name=decoy_list,json=decoyList" json:"decoy_list,omitempty"`
-	Generation           *uint32          `protobuf:"varint,2,opt,name=generation" json:"generation,omitempty"`
-	DefaultPubkey        *PubKey          `protobuf:"bytes,3,opt,name=default_pubkey,json=defaultPubkey" json:"default_pubkey,omitempty"`
-	DarkDecoyBlocks      *DarkDecoyBlocks `protobuf:"bytes,4,opt,name=dark_decoy_blocks,json=darkDecoyBlocks" json:"dark_decoy_blocks,omitempty"`
-	ConjurePubkey        *PubKey          `protobuf:"bytes,5,opt,name=conjure_pubkey,json=conjurePubkey" json:"conjure_pubkey,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
-	XXX_unrecognized     []byte           `json:"-"`
-	XXX_sizecache        int32            `json:"-"`
+	DecoyList            *DecoyList          `protobuf:"bytes,1,opt,name=decoy_list,json=decoyList" json:"decoy_list,omitempty"`
+	Generation           *uint32             `protobuf:"varint,2,opt,name=generation" json:"generation,omitempty"`
+	DefaultPubkey        *PubKey             `protobuf:"bytes,3,opt,name=default_pubkey,json=defaultPubkey" json:"default_pubkey,omitempty"`
+	PhantomSubnetsList   *PhantomSubnetsList `protobuf:"bytes,4,opt,name=phantom_subnets_list,json=phantomSubnetsList" json:"phantom_subnets_list,omitempty"`
+	ConjurePubkey        *PubKey             `protobuf:"bytes,5,opt,name=conjure_pubkey,json=conjurePubkey" json:"conjure_pubkey,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
 func (m *ClientConf) Reset()         { *m = ClientConf{} }
@@ -534,9 +534,9 @@ func (m *ClientConf) GetDefaultPubkey() *PubKey {
 	return nil
 }
 
-func (m *ClientConf) GetDarkDecoyBlocks() *DarkDecoyBlocks {
+func (m *ClientConf) GetPhantomSubnetsList() *PhantomSubnetsList {
 	if m != nil {
-		return m.DarkDecoyBlocks
+		return m.PhantomSubnetsList
 	}
 	return nil
 }
@@ -587,41 +587,88 @@ func (m *DecoyList) GetTlsDecoys() []*TLSDecoySpec {
 	return nil
 }
 
-type DarkDecoyBlocks struct {
-	Blocks               []string `protobuf:"bytes,1,rep,name=blocks" json:"blocks,omitempty"`
+type PhantomSubnetsList struct {
+	WeightedSubnets      []*PhantomSubnets `protobuf:"bytes,1,rep,name=weighted_subnets,json=weightedSubnets" json:"weighted_subnets,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *PhantomSubnetsList) Reset()         { *m = PhantomSubnetsList{} }
+func (m *PhantomSubnetsList) String() string { return proto.CompactTextString(m) }
+func (*PhantomSubnetsList) ProtoMessage()    {}
+func (*PhantomSubnetsList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_39f66308029891ad, []int{4}
+}
+
+func (m *PhantomSubnetsList) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PhantomSubnetsList.Unmarshal(m, b)
+}
+func (m *PhantomSubnetsList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PhantomSubnetsList.Marshal(b, m, deterministic)
+}
+func (m *PhantomSubnetsList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PhantomSubnetsList.Merge(m, src)
+}
+func (m *PhantomSubnetsList) XXX_Size() int {
+	return xxx_messageInfo_PhantomSubnetsList.Size(m)
+}
+func (m *PhantomSubnetsList) XXX_DiscardUnknown() {
+	xxx_messageInfo_PhantomSubnetsList.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PhantomSubnetsList proto.InternalMessageInfo
+
+func (m *PhantomSubnetsList) GetWeightedSubnets() []*PhantomSubnets {
+	if m != nil {
+		return m.WeightedSubnets
+	}
+	return nil
+}
+
+type PhantomSubnets struct {
+	Weight               *uint32  `protobuf:"varint,1,opt,name=weight" json:"weight,omitempty"`
+	Subnets              []string `protobuf:"bytes,2,rep,name=subnets" json:"subnets,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DarkDecoyBlocks) Reset()         { *m = DarkDecoyBlocks{} }
-func (m *DarkDecoyBlocks) String() string { return proto.CompactTextString(m) }
-func (*DarkDecoyBlocks) ProtoMessage()    {}
-func (*DarkDecoyBlocks) Descriptor() ([]byte, []int) {
-	return fileDescriptor_39f66308029891ad, []int{4}
+func (m *PhantomSubnets) Reset()         { *m = PhantomSubnets{} }
+func (m *PhantomSubnets) String() string { return proto.CompactTextString(m) }
+func (*PhantomSubnets) ProtoMessage()    {}
+func (*PhantomSubnets) Descriptor() ([]byte, []int) {
+	return fileDescriptor_39f66308029891ad, []int{5}
 }
 
-func (m *DarkDecoyBlocks) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_DarkDecoyBlocks.Unmarshal(m, b)
+func (m *PhantomSubnets) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PhantomSubnets.Unmarshal(m, b)
 }
-func (m *DarkDecoyBlocks) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_DarkDecoyBlocks.Marshal(b, m, deterministic)
+func (m *PhantomSubnets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PhantomSubnets.Marshal(b, m, deterministic)
 }
-func (m *DarkDecoyBlocks) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DarkDecoyBlocks.Merge(m, src)
+func (m *PhantomSubnets) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PhantomSubnets.Merge(m, src)
 }
-func (m *DarkDecoyBlocks) XXX_Size() int {
-	return xxx_messageInfo_DarkDecoyBlocks.Size(m)
+func (m *PhantomSubnets) XXX_Size() int {
+	return xxx_messageInfo_PhantomSubnets.Size(m)
 }
-func (m *DarkDecoyBlocks) XXX_DiscardUnknown() {
-	xxx_messageInfo_DarkDecoyBlocks.DiscardUnknown(m)
+func (m *PhantomSubnets) XXX_DiscardUnknown() {
+	xxx_messageInfo_PhantomSubnets.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_DarkDecoyBlocks proto.InternalMessageInfo
+var xxx_messageInfo_PhantomSubnets proto.InternalMessageInfo
 
-func (m *DarkDecoyBlocks) GetBlocks() []string {
+func (m *PhantomSubnets) GetWeight() uint32 {
+	if m != nil && m.Weight != nil {
+		return *m.Weight
+	}
+	return 0
+}
+
+func (m *PhantomSubnets) GetSubnets() []string {
 	if m != nil {
-		return m.Blocks
+		return m.Subnets
 	}
 	return nil
 }
@@ -652,7 +699,7 @@ func (m *StationToClient) Reset()         { *m = StationToClient{} }
 func (m *StationToClient) String() string { return proto.CompactTextString(m) }
 func (*StationToClient) ProtoMessage()    {}
 func (*StationToClient) Descriptor() ([]byte, []int) {
-	return fileDescriptor_39f66308029891ad, []int{5}
+	return fileDescriptor_39f66308029891ad, []int{6}
 }
 
 func (m *StationToClient) XXX_Unmarshal(b []byte) error {
@@ -737,7 +784,7 @@ func (m *RegistrationFlags) Reset()         { *m = RegistrationFlags{} }
 func (m *RegistrationFlags) String() string { return proto.CompactTextString(m) }
 func (*RegistrationFlags) ProtoMessage()    {}
 func (*RegistrationFlags) Descriptor() ([]byte, []int) {
-	return fileDescriptor_39f66308029891ad, []int{6}
+	return fileDescriptor_39f66308029891ad, []int{7}
 }
 
 func (m *RegistrationFlags) XXX_Unmarshal(b []byte) error {
@@ -834,7 +881,7 @@ func (m *ClientToStation) Reset()         { *m = ClientToStation{} }
 func (m *ClientToStation) String() string { return proto.CompactTextString(m) }
 func (*ClientToStation) ProtoMessage()    {}
 func (*ClientToStation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_39f66308029891ad, []int{7}
+	return fileDescriptor_39f66308029891ad, []int{8}
 }
 
 func (m *ClientToStation) XXX_Unmarshal(b []byte) error {
@@ -963,7 +1010,7 @@ 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}
+	return fileDescriptor_39f66308029891ad, []int{9}
 }
 
 func (m *C2SWrapper) XXX_Unmarshal(b []byte) error {
@@ -1036,7 +1083,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{9}
+	return fileDescriptor_39f66308029891ad, []int{10}
 }
 
 func (m *SessionStats) XXX_Unmarshal(b []byte) error {
@@ -1105,7 +1152,7 @@ func (m *StationToDetector) Reset()         { *m = StationToDetector{} }
 func (m *StationToDetector) String() string { return proto.CompactTextString(m) }
 func (*StationToDetector) ProtoMessage()    {}
 func (*StationToDetector) Descriptor() ([]byte, []int) {
-	return fileDescriptor_39f66308029891ad, []int{10}
+	return fileDescriptor_39f66308029891ad, []int{11}
 }
 
 func (m *StationToDetector) XXX_Unmarshal(b []byte) error {
@@ -1158,7 +1205,8 @@ func init() {
 	proto.RegisterType((*TLSDecoySpec)(nil), "tapdance.TLSDecoySpec")
 	proto.RegisterType((*ClientConf)(nil), "tapdance.ClientConf")
 	proto.RegisterType((*DecoyList)(nil), "tapdance.DecoyList")
-	proto.RegisterType((*DarkDecoyBlocks)(nil), "tapdance.DarkDecoyBlocks")
+	proto.RegisterType((*PhantomSubnetsList)(nil), "tapdance.PhantomSubnetsList")
+	proto.RegisterType((*PhantomSubnets)(nil), "tapdance.PhantomSubnets")
 	proto.RegisterType((*StationToClient)(nil), "tapdance.StationToClient")
 	proto.RegisterType((*RegistrationFlags)(nil), "tapdance.RegistrationFlags")
 	proto.RegisterType((*ClientToStation)(nil), "tapdance.ClientToStation")
@@ -1170,99 +1218,102 @@ func init() {
 func init() { proto.RegisterFile("signalling.proto", fileDescriptor_39f66308029891ad) }
 
 var fileDescriptor_39f66308029891ad = []byte{
-	// 1504 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xdd, 0x72, 0xe3, 0x48,
-	0x15, 0x1e, 0xe5, 0xd7, 0x3e, 0xfe, 0x89, 0xd2, 0x93, 0xcc, 0x68, 0x98, 0x5d, 0x36, 0xeb, 0x65,
-	0x21, 0x1b, 0x60, 0x8a, 0x71, 0xcd, 0x0f, 0xb7, 0x1e, 0x45, 0x3b, 0xeb, 0x5a, 0xc7, 0xf2, 0xb6,
-	0x34, 0x0b, 0x03, 0x17, 0x5d, 0x8a, 0xd4, 0xce, 0x88, 0x28, 0x6a, 0x55, 0x77, 0x3b, 0xe0, 0x37,
-	0x81, 0x17, 0xe0, 0x8a, 0x2a, 0xde, 0x80, 0x17, 0xd8, 0x67, 0xe0, 0x9a, 0xc7, 0x80, 0xea, 0x1f,
-	0xd9, 0x72, 0xb2, 0x2c, 0xc5, 0x9d, 0xfa, 0x3b, 0xe7, 0xf4, 0xf9, 0xfb, 0xce, 0x69, 0x81, 0x2b,
-	0xf2, 0xab, 0x32, 0x29, 0x8a, 0xbc, 0xbc, 0x7a, 0x56, 0x71, 0x26, 0x19, 0x6a, 0xc9, 0xa4, 0xca,
-	0x92, 0x32, 0xa5, 0x83, 0x11, 0xec, 0xcd, 0x16, 0x97, 0x5f, 0xd3, 0x25, 0x72, 0x61, 0xfb, 0x9a,
-	0x2e, 0x3d, 0xe7, 0xc4, 0x39, 0xed, 0x62, 0xf5, 0x89, 0x3e, 0x87, 0x1d, 0xb9, 0xac, 0xa8, 0xb7,
-	0x75, 0xe2, 0x9c, 0xf6, 0x87, 0x87, 0xcf, 0x6a, 0xa3, 0x67, 0x5f, 0xd3, 0x65, 0xbc, 0xac, 0x28,
-	0xd6, 0xe2, 0xc1, 0x3f, 0x1c, 0xe8, 0xc6, 0x93, 0xe8, 0x9c, 0xa6, 0x6c, 0x19, 0x55, 0x34, 0x45,
-	0x3f, 0x82, 0xd6, 0x07, 0x26, 0x64, 0x99, 0xdc, 0x50, 0x7d, 0x5d, 0x1b, 0xaf, 0xce, 0x4a, 0x96,
-	0x57, 0xb7, 0x2f, 0x92, 0x2c, 0xe3, 0xfa, 0xde, 0x7d, 0xbc, 0x3a, 0x5b, 0xd9, 0x2b, 0x2d, 0xdb,
-	0xd3, 0x61, 0xac, 0xce, 0xe8, 0x14, 0xf6, 0xaa, 0xc5, 0xa5, 0x0a, 0x70, 0xfb, 0xc4, 0x39, 0xed,
-	0x0c, 0xdd, 0x75, 0x34, 0x26, 0x7e, 0x6c, 0xe5, 0xc8, 0x83, 0x7d, 0x99, 0xdf, 0x50, 0xb6, 0x90,
-	0xde, 0xce, 0x89, 0x73, 0xda, 0xc3, 0xf5, 0x11, 0x3d, 0x82, 0x3d, 0x99, 0x56, 0x7f, 0xcc, 0x4b,
-	0x6f, 0x57, 0x0b, 0xec, 0x69, 0xf0, 0x97, 0x2d, 0x00, 0xbf, 0xc8, 0x69, 0x29, 0x7d, 0x56, 0xce,
-	0xd1, 0x10, 0x20, 0x53, 0xb9, 0x90, 0x22, 0x17, 0x52, 0x27, 0xd0, 0x19, 0x3e, 0x5c, 0xbb, 0xd3,
-	0x79, 0x4e, 0x72, 0x21, 0x71, 0x3b, 0xab, 0x3f, 0xd1, 0x8f, 0x01, 0xae, 0x68, 0x49, 0x79, 0x22,
-	0x73, 0x56, 0xea, 0xc4, 0x7a, 0xb8, 0x81, 0xa0, 0xd7, 0xd0, 0xcf, 0xe8, 0x3c, 0x59, 0x14, 0x92,
-	0xfc, 0x8f, 0x34, 0x7a, 0x56, 0x6f, 0x66, 0xb2, 0x09, 0xe0, 0x30, 0x4b, 0xf8, 0x35, 0x31, 0x11,
-	0x5d, 0x16, 0x2c, 0xbd, 0x16, 0x3a, 0xaf, 0xce, 0xf0, 0x49, 0x23, 0xa6, 0x84, 0x5f, 0xeb, 0xb8,
-	0xde, 0x68, 0x05, 0x7c, 0x90, 0x6d, 0x02, 0xca, 0x7f, 0xca, 0xca, 0x3f, 0x2c, 0x38, 0xad, 0xfd,
-	0xef, 0xfe, 0x37, 0xff, 0x56, 0xcf, 0xf8, 0x1f, 0xbc, 0x81, 0xf6, 0x2a, 0x61, 0xf4, 0x12, 0x40,
-	0x16, 0xc2, 0xc4, 0x22, 0x3c, 0xe7, 0x64, 0xfb, 0xb4, 0x33, 0x7c, 0xb4, 0xbe, 0xa1, 0x49, 0x02,
-	0xdc, 0x96, 0x85, 0xd0, 0x27, 0x31, 0xf8, 0x02, 0x0e, 0xee, 0x04, 0xa8, 0x5a, 0x61, 0x73, 0x51,
-	0xb7, 0xb4, 0xb1, 0x3d, 0x0d, 0xbe, 0xdb, 0x82, 0x83, 0x48, 0xea, 0x9a, 0xc5, 0xcc, 0xf4, 0x04,
-	0x7d, 0x01, 0xae, 0x66, 0x6d, 0xca, 0x0a, 0x72, 0x4b, 0xb9, 0x50, 0x15, 0x76, 0x74, 0x85, 0x0f,
-	0x6a, 0xfc, 0x5b, 0x03, 0x23, 0x1f, 0x5c, 0x21, 0x13, 0x49, 0x89, 0xe4, 0x49, 0x29, 0xf2, 0x55,
-	0x33, 0xfa, 0x43, 0x6f, 0x1d, 0x66, 0x34, 0xf4, 0x49, 0xbc, 0x92, 0xe3, 0x03, 0x6d, 0xb1, 0x06,
-	0xd0, 0x4b, 0xe8, 0xa4, 0xac, 0x9c, 0xe7, 0x57, 0x24, 0x2f, 0xe7, 0xcc, 0x36, 0xea, 0x68, 0x6d,
-	0xbf, 0xa6, 0x0a, 0x06, 0xa3, 0x38, 0x2e, 0xe7, 0x0c, 0xbd, 0x06, 0xa0, 0x9c, 0x13, 0x4e, 0x13,
-	0xc1, 0x4a, 0xdd, 0xa2, 0x0d, 0xaf, 0x01, 0xe7, 0x8c, 0x63, 0x2d, 0x8c, 0x86, 0x3e, 0x6e, 0x53,
-	0x6e, 0x4f, 0xe8, 0x13, 0xe8, 0xc8, 0x9b, 0x8a, 0x5c, 0x26, 0xe9, 0x35, 0x9b, 0xcf, 0x2d, 0x37,
-	0x41, 0xde, 0x54, 0x6f, 0x0c, 0x82, 0x3e, 0x06, 0x10, 0xa6, 0x26, 0x24, 0xcf, 0xf4, 0x64, 0xb4,
-	0x71, 0xdb, 0x22, 0xe3, 0x4c, 0x11, 0xbe, 0x4a, 0xb2, 0x2c, 0x2f, 0xaf, 0xbc, 0x4c, 0x4f, 0x4d,
-	0x7d, 0x1c, 0xfc, 0xdd, 0x81, 0x43, 0x4c, 0xaf, 0x72, 0x21, 0x0d, 0x0d, 0xbf, 0x2c, 0x92, 0x2b,
-	0xa1, 0xfc, 0x2d, 0xaa, 0x82, 0x25, 0x19, 0x61, 0x65, 0x61, 0x06, 0xbe, 0x85, 0xc1, 0x40, 0x61,
-	0x59, 0x2c, 0x95, 0xbf, 0x35, 0xe7, 0x74, 0xfd, 0x5a, 0xb8, 0xbd, 0x62, 0x14, 0xfa, 0x14, 0xba,
-	0x15, 0x67, 0x7f, 0x5a, 0x92, 0x0f, 0x34, 0xc9, 0x28, 0xd7, 0x05, 0x6a, 0xe1, 0x8e, 0xc6, 0xbe,
-	0xd2, 0x10, 0x7a, 0x0c, 0xfb, 0x0b, 0x41, 0x49, 0x3c, 0x9e, 0xe8, 0x42, 0xb4, 0xf0, 0xde, 0x42,
-	0xd0, 0x78, 0x3c, 0x51, 0x73, 0x52, 0x71, 0x2a, 0xd2, 0xa4, 0x2c, 0x69, 0xa6, 0x53, 0x6d, 0xe1,
-	0x06, 0x32, 0xf8, 0x6e, 0x07, 0x0e, 0x4c, 0x7d, 0x63, 0x66, 0x79, 0xf0, 0xff, 0xf4, 0x7f, 0x08,
-	0xc7, 0xeb, 0xd1, 0x25, 0xf7, 0x26, 0xf2, 0xe1, 0x6a, 0x60, 0xdf, 0xae, 0x47, 0xf3, 0xfb, 0x38,
-	0xb3, 0x7d, 0xb7, 0x7b, 0xfe, 0x30, 0xfa, 0x41, 0xce, 0xac, 0x6b, 0x2a, 0x96, 0x65, 0xaa, 0x93,
-	0xde, 0xa9, 0x6b, 0x1a, 0x2d, 0xcb, 0x14, 0x7d, 0x06, 0xbd, 0x79, 0x92, 0x17, 0x34, 0xab, 0xa7,
-	0x07, 0x34, 0xef, 0xbb, 0x06, 0x34, 0x83, 0x82, 0x7e, 0x01, 0xbb, 0xea, 0x62, 0xe1, 0x75, 0x34,
-	0xe7, 0x1a, 0xa3, 0x15, 0x51, 0xa1, 0x12, 0x54, 0x25, 0x11, 0xd8, 0x28, 0xa1, 0x97, 0xd0, 0xd6,
-	0x21, 0x57, 0x8c, 0x4b, 0xaf, 0xab, 0x23, 0x7e, 0xdc, 0x18, 0xc6, 0x5a, 0xa4, 0x37, 0xf5, 0x5a,
-	0x13, 0x7d, 0xae, 0x56, 0xc1, 0x2d, 0xe5, 0x92, 0xa8, 0xc5, 0x4a, 0x85, 0xf0, 0x8e, 0x34, 0xa3,
-	0x7a, 0x06, 0x1d, 0x19, 0x10, 0xbd, 0x06, 0xef, 0x26, 0x11, 0xd7, 0x75, 0xc0, 0x44, 0x50, 0x7e,
-	0x4b, 0x39, 0xd1, 0x4b, 0xfd, 0x58, 0x1b, 0x1c, 0x1b, 0xb9, 0x19, 0x79, 0x2d, 0x9d, 0xaa, 0x0d,
-	0xff, 0x31, 0xc0, 0xed, 0x2b, 0x22, 0x16, 0x95, 0x8e, 0xeb, 0x91, 0x61, 0xcf, 0xed, 0xab, 0xc8,
-	0x00, 0x5a, 0xfc, 0x62, 0x25, 0x7e, 0x6c, 0xc5, 0x2f, 0x6a, 0xf1, 0x73, 0xd8, 0x9d, 0x2b, 0x96,
-	0x7a, 0x9e, 0x2e, 0xc1, 0xd3, 0x75, 0x42, 0xf7, 0x88, 0x8c, 0x8d, 0xe6, 0x0f, 0xf0, 0xff, 0xaf,
-	0x6a, 0xb1, 0x0f, 0xa3, 0xdf, 0xf0, 0xa4, 0xaa, 0x28, 0x57, 0x3d, 0x10, 0x1f, 0x12, 0x4e, 0x33,
-	0x22, 0x68, 0xca, 0xa9, 0xb4, 0x6f, 0x5d, 0xd7, 0x80, 0x91, 0xc6, 0xd0, 0x04, 0x8e, 0x78, 0xc3,
-	0x13, 0xa9, 0x92, 0xa5, 0x6a, 0xa2, 0x5d, 0x03, 0x4f, 0xee, 0xae, 0x81, 0x15, 0x4d, 0xf1, 0xc3,
-	0xa6, 0xd9, 0xcc, 0x58, 0xa1, 0x0b, 0xd8, 0x80, 0x89, 0x60, 0x0b, 0x9e, 0x52, 0xbb, 0x1d, 0x3e,
-	0xfa, 0xfe, 0xe4, 0x22, 0xad, 0x83, 0x11, 0xbf, 0x87, 0xa1, 0xe7, 0x77, 0x82, 0xab, 0x3b, 0x68,
-	0x5e, 0xcb, 0x0d, 0x57, 0x75, 0x1f, 0x3f, 0x83, 0x9e, 0x69, 0x60, 0xad, 0xbb, 0x6f, 0x92, 0xd6,
-	0xa0, 0x55, 0x1a, 0xfc, 0xd3, 0x81, 0x6e, 0x93, 0x62, 0xe8, 0x57, 0x70, 0xb4, 0x41, 0x57, 0x92,
-	0xdc, 0xb0, 0x45, 0x29, 0x35, 0x55, 0x7a, 0x18, 0x35, 0x59, 0x3b, 0xd2, 0x12, 0xf4, 0x1c, 0x8e,
-	0x25, 0x93, 0x49, 0x41, 0xd4, 0x6b, 0x4b, 0x24, 0x23, 0x29, 0x2b, 0x4b, 0x9a, 0x4a, 0xef, 0x13,
-	0x63, 0xa2, 0x85, 0x71, 0x7e, 0x43, 0x63, 0xe6, 0x1b, 0x09, 0xfa, 0x09, 0xf4, 0xb9, 0x94, 0x4a,
-	0xd7, 0x2e, 0x33, 0xef, 0x53, 0xad, 0xdb, 0xe5, 0xb2, 0x31, 0xfe, 0x27, 0xd0, 0x55, 0x8f, 0x8e,
-	0x64, 0x76, 0x1f, 0xfd, 0xd4, 0xee, 0xc7, 0x42, 0xc4, 0xcc, 0x2c, 0x24, 0xa5, 0x91, 0x56, 0x6b,
-	0x8d, 0x9f, 0x59, 0x8d, 0xb4, 0xb2, 0x1a, 0x83, 0x12, 0x0e, 0x57, 0xaf, 0xca, 0x39, 0x95, 0x34,
-	0x95, 0x8c, 0x2b, 0x26, 0x56, 0x1f, 0x92, 0x52, 0xb2, 0x1b, 0x92, 0x57, 0xf6, 0x47, 0xa5, 0x6d,
-	0x91, 0x71, 0x85, 0x9e, 0x42, 0x3b, 0xd5, 0x2d, 0x56, 0xd2, 0x2d, 0xf3, 0x1b, 0x63, 0x80, 0x71,
-	0xa5, 0x6c, 0xed, 0x5f, 0x05, 0x29, 0x85, 0xe6, 0xc6, 0x0e, 0x6e, 0x5b, 0x64, 0x2a, 0xce, 0x7e,
-	0x0e, 0xfb, 0xf6, 0x1f, 0x09, 0x1d, 0x40, 0x67, 0x14, 0x44, 0xe4, 0xad, 0x7f, 0x41, 0x9e, 0x0f,
-	0x7f, 0xed, 0xfe, 0xae, 0x09, 0x0c, 0x5f, 0xbe, 0x72, 0x7f, 0x7f, 0xf6, 0x2f, 0x07, 0xfa, 0x9b,
-	0xfb, 0x05, 0x1d, 0x42, 0x4f, 0x21, 0xd3, 0x90, 0xf8, 0x5f, 0x8d, 0xa6, 0x6f, 0x03, 0xf7, 0x01,
-	0x3a, 0x02, 0x57, 0x41, 0x51, 0x10, 0x45, 0xe3, 0x70, 0x4a, 0xc6, 0xd3, 0x71, 0xec, 0x3a, 0xe8,
-	0x29, 0x3c, 0x6e, 0xa2, 0x7e, 0xf8, 0x6d, 0x80, 0x63, 0x23, 0xec, 0x20, 0x0f, 0x8e, 0x94, 0x30,
-	0xf8, 0xed, 0x2c, 0xf0, 0x63, 0x82, 0x03, 0x3f, 0x9c, 0x4e, 0x03, 0x3f, 0x76, 0xb7, 0xd0, 0x31,
-	0x1c, 0x6e, 0x98, 0x4d, 0xc2, 0x28, 0x70, 0xb7, 0x6b, 0x1f, 0xef, 0xc7, 0xc1, 0xe4, 0x9c, 0xbc,
-	0x9b, 0x4d, 0xc2, 0xd1, 0xb9, 0xbb, 0x83, 0x1e, 0x01, 0x52, 0xe8, 0xc8, 0xff, 0xe6, 0xdd, 0x18,
-	0x07, 0x35, 0xbe, 0x8b, 0x4e, 0xe0, 0xa3, 0xc6, 0xf5, 0x06, 0x0e, 0xa7, 0x93, 0xf7, 0xd6, 0x93,
-	0xbb, 0x87, 0xfa, 0xd0, 0xd6, 0x1a, 0x18, 0x87, 0xd8, 0xfd, 0xb7, 0x73, 0xf6, 0x67, 0x07, 0xfa,
-	0x9b, 0xaf, 0xaf, 0xca, 0x54, 0x21, 0x77, 0x32, 0x55, 0xd0, 0xfd, 0x4c, 0x9b, 0xe8, 0x66, 0xa6,
-	0x4f, 0xe0, 0x58, 0x09, 0xfd, 0x70, 0xfa, 0xe5, 0x18, 0x5f, 0xdc, 0x4d, 0x75, 0xc3, 0xce, 0xa6,
-	0xda, 0x87, 0xb6, 0x82, 0x57, 0xa1, 0xfd, 0xcd, 0x81, 0xfe, 0xe6, 0x13, 0x8d, 0xba, 0xd0, 0x9a,
-	0x86, 0x56, 0xe3, 0x81, 0x6e, 0x89, 0xf1, 0x19, 0xc5, 0x38, 0x18, 0x5d, 0xb8, 0x0e, 0x7a, 0x08,
-	0x07, 0xfe, 0x64, 0x1c, 0x4c, 0x55, 0x6d, 0x67, 0x21, 0x8e, 0x83, 0x73, 0x77, 0xab, 0x01, 0xce,
-	0x70, 0x18, 0x87, 0x7e, 0x38, 0x31, 0x85, 0x8d, 0xe2, 0x51, 0x6c, 0xd2, 0x89, 0x03, 0x3c, 0x1d,
-	0x4d, 0xdc, 0x1d, 0x84, 0xa0, 0x7f, 0x1e, 0xf8, 0xe1, 0x7b, 0xa2, 0xee, 0xb5, 0x45, 0x55, 0x6e,
-	0x8c, 0xb9, 0x75, 0x93, 0x29, 0x35, 0x0b, 0xc5, 0xe3, 0x8b, 0x20, 0x7c, 0x17, 0xbb, 0xf4, 0xec,
-	0x97, 0xd0, 0xdb, 0x58, 0xf0, 0xa8, 0x05, 0x3b, 0xd3, 0x45, 0x51, 0xb8, 0x0f, 0xd0, 0x3e, 0x6c,
-	0x5f, 0xe4, 0xa5, 0xeb, 0xa0, 0x36, 0xec, 0x86, 0x97, 0x73, 0xf1, 0xc2, 0xdd, 0x3a, 0xfb, 0x06,
-	0xd0, 0xfd, 0x0d, 0xa3, 0x98, 0xf8, 0xae, 0x14, 0x15, 0x4d, 0xf3, 0x79, 0x4e, 0x33, 0xf7, 0x81,
-	0xca, 0xb8, 0x9e, 0x0e, 0xd7, 0x51, 0x17, 0x8d, 0x66, 0x63, 0x93, 0x52, 0x0d, 0xcf, 0xcc, 0x53,
-	0xed, 0x6e, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xa2, 0xac, 0xba, 0x55, 0x0c, 0x00, 0x00,
+	// 1542 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcd, 0x72, 0xe3, 0xc6,
+	0x11, 0x5e, 0x88, 0x94, 0x44, 0x34, 0x7f, 0x04, 0xcd, 0x4a, 0xbb, 0x70, 0x76, 0x1d, 0xd3, 0x74,
+	0x9c, 0x28, 0x4a, 0xb2, 0x95, 0x65, 0xed, 0x4f, 0xae, 0x5c, 0x08, 0x5e, 0xb3, 0x4c, 0x11, 0xf4,
+	0x00, 0xeb, 0x64, 0x93, 0xc3, 0x14, 0x04, 0x0c, 0x29, 0x44, 0x20, 0x80, 0xc2, 0x0c, 0xe5, 0xf0,
+	0x4d, 0x72, 0xce, 0x21, 0xa7, 0x54, 0xe5, 0x0d, 0xf2, 0x02, 0x7e, 0x86, 0x9c, 0xf3, 0x18, 0x49,
+	0xcd, 0x0f, 0x48, 0x50, 0xb2, 0x37, 0xe5, 0x1b, 0xe6, 0xeb, 0xee, 0x99, 0xfe, 0xa6, 0xbf, 0xe9,
+	0x06, 0x58, 0x2c, 0x59, 0x64, 0x61, 0x9a, 0x26, 0xd9, 0xe2, 0x59, 0x51, 0xe6, 0x3c, 0x47, 0x2d,
+	0x1e, 0x16, 0x71, 0x98, 0x45, 0x74, 0x30, 0x82, 0x83, 0xd9, 0xea, 0xea, 0x2b, 0xba, 0x46, 0x16,
+	0x34, 0x6e, 0xe8, 0xda, 0x36, 0xfa, 0xc6, 0x59, 0x07, 0x8b, 0x4f, 0xf4, 0x39, 0x34, 0xf9, 0xba,
+	0xa0, 0xf6, 0x5e, 0xdf, 0x38, 0xeb, 0x0d, 0x8f, 0x9f, 0x55, 0x41, 0xcf, 0xbe, 0xa2, 0xeb, 0x60,
+	0x5d, 0x50, 0x2c, 0xcd, 0x83, 0x7f, 0x19, 0xd0, 0x09, 0x26, 0xfe, 0x05, 0x8d, 0xf2, 0xb5, 0x5f,
+	0xd0, 0x08, 0xfd, 0x04, 0x5a, 0xd7, 0x39, 0xe3, 0x59, 0xb8, 0xa4, 0x72, 0x3b, 0x13, 0x6f, 0xd6,
+	0xc2, 0x96, 0x14, 0xb7, 0x2f, 0xc2, 0x38, 0x2e, 0xe5, 0xbe, 0x87, 0x78, 0xb3, 0xd6, 0xb6, 0x57,
+	0xd2, 0x76, 0x20, 0xd3, 0xd8, 0xac, 0xd1, 0x19, 0x1c, 0x14, 0xab, 0x2b, 0x91, 0x60, 0xa3, 0x6f,
+	0x9c, 0xb5, 0x87, 0xd6, 0x36, 0x1b, 0x95, 0x3f, 0xd6, 0x76, 0x64, 0xc3, 0x21, 0x4f, 0x96, 0x34,
+	0x5f, 0x71, 0xbb, 0xd9, 0x37, 0xce, 0xba, 0xb8, 0x5a, 0xa2, 0x47, 0x70, 0xc0, 0xa3, 0xe2, 0xdb,
+	0x24, 0xb3, 0xf7, 0xa5, 0x41, 0xaf, 0x06, 0x7f, 0xdb, 0x03, 0x70, 0xd2, 0x84, 0x66, 0xdc, 0xc9,
+	0xb3, 0x39, 0x1a, 0x02, 0xc4, 0x82, 0x0b, 0x49, 0x13, 0xc6, 0x25, 0x81, 0xf6, 0xf0, 0xe1, 0xf6,
+	0x38, 0xc9, 0x73, 0x92, 0x30, 0x8e, 0xcd, 0xb8, 0xfa, 0x44, 0x3f, 0x05, 0x58, 0xd0, 0x8c, 0x96,
+	0x21, 0x4f, 0xf2, 0x4c, 0x12, 0xeb, 0xe2, 0x1a, 0x82, 0x5e, 0x43, 0x2f, 0xa6, 0xf3, 0x70, 0x95,
+	0x72, 0xf2, 0x7f, 0x68, 0x74, 0xb5, 0xdf, 0x4c, 0xb1, 0x99, 0xc2, 0x49, 0x71, 0x1d, 0x66, 0x3c,
+	0x5f, 0x12, 0xb6, 0xba, 0xca, 0x28, 0x67, 0x2a, 0xad, 0xa6, 0x0c, 0x7f, 0x5a, 0x0b, 0x57, 0x5e,
+	0xbe, 0x72, 0x92, 0xf9, 0xa1, 0xe2, 0x1e, 0x26, 0x12, 0x89, 0xf2, 0xec, 0xcf, 0xab, 0x92, 0x56,
+	0x89, 0xec, 0xff, 0x50, 0x22, 0xda, 0x4f, 0x25, 0x32, 0x78, 0x03, 0xe6, 0x86, 0x39, 0x7a, 0x09,
+	0xc0, 0x53, 0x46, 0x24, 0x7f, 0x66, 0x1b, 0xfd, 0xc6, 0x59, 0x7b, 0xf8, 0x68, 0xbb, 0x43, 0x5d,
+	0x0d, 0xd8, 0xe4, 0x29, 0x93, 0x2b, 0x36, 0x78, 0x0f, 0xe8, 0x7e, 0x9a, 0xc8, 0x01, 0xeb, 0x5b,
+	0x9a, 0x2c, 0xae, 0x39, 0x8d, 0x2b, 0x8e, 0x7a, 0x4b, 0xfb, 0x87, 0xe8, 0xe1, 0xa3, 0x2a, 0x42,
+	0x03, 0x83, 0x37, 0xd0, 0xdb, 0x75, 0x11, 0xd5, 0x56, 0x4e, 0xb2, 0x84, 0x5d, 0xac, 0x57, 0x42,
+	0x1f, 0xd5, 0x29, 0x7b, 0xfd, 0xc6, 0x99, 0x89, 0xab, 0xe5, 0xe0, 0xbb, 0x3d, 0x38, 0xf2, 0xb9,
+	0x2c, 0x58, 0x90, 0x2b, 0x41, 0xa0, 0x5f, 0x82, 0x25, 0x9f, 0x4c, 0x94, 0xa7, 0xe4, 0x96, 0x96,
+	0x4c, 0x94, 0x57, 0xed, 0x77, 0x54, 0xe1, 0xdf, 0x28, 0x58, 0xf0, 0x60, 0x3c, 0xe4, 0x94, 0xf0,
+	0x32, 0xcc, 0x58, 0xb2, 0x51, 0x42, 0xaf, 0xce, 0xc3, 0x1f, 0x3a, 0x24, 0xd8, 0xd8, 0xf1, 0x91,
+	0x8c, 0xd8, 0x02, 0xe8, 0x25, 0xb4, 0xa3, 0x3c, 0x9b, 0x27, 0x0b, 0x92, 0x64, 0xf3, 0x5c, 0xab,
+	0xe4, 0x64, 0x1b, 0xbf, 0xd5, 0x29, 0x06, 0xe5, 0x38, 0xce, 0xe6, 0x39, 0x7a, 0x0d, 0x40, 0xcb,
+	0x92, 0x94, 0x34, 0x64, 0x79, 0x26, 0xc5, 0xb1, 0x73, 0xaa, 0x5b, 0x96, 0x79, 0x89, 0xa5, 0xd1,
+	0x1f, 0x3a, 0xd8, 0xa4, 0xa5, 0x5e, 0xa1, 0x4f, 0xa0, 0xcd, 0x97, 0x05, 0xb9, 0x0a, 0xa3, 0x9b,
+	0x7c, 0x3e, 0xd7, 0x0f, 0x03, 0xf8, 0xb2, 0x78, 0xa3, 0x10, 0xf4, 0x31, 0x00, 0x53, 0x77, 0x42,
+	0x92, 0x58, 0x3e, 0x4b, 0x13, 0x9b, 0x1a, 0x19, 0xc7, 0xe2, 0x36, 0x8b, 0x30, 0x8e, 0x93, 0x6c,
+	0x61, 0xc7, 0xf2, 0xc9, 0x56, 0xcb, 0xc1, 0x3f, 0x0d, 0x38, 0xc6, 0x74, 0x91, 0x30, 0xae, 0xde,
+	0xc0, 0x17, 0x69, 0xb8, 0x60, 0xe2, 0xbc, 0x55, 0x91, 0xe6, 0x61, 0x4c, 0xf2, 0x2c, 0x55, 0xdd,
+	0xa6, 0x85, 0x41, 0x41, 0x5e, 0x96, 0xae, 0xc5, 0x79, 0x71, 0x58, 0xde, 0x28, 0x6d, 0xc9, 0xfb,
+	0x6b, 0x61, 0x53, 0x20, 0x52, 0x43, 0xe8, 0x53, 0xe8, 0x14, 0x65, 0xfe, 0x97, 0x35, 0xb9, 0xa6,
+	0x61, 0x4c, 0x4b, 0x79, 0x41, 0x2d, 0xdc, 0x96, 0xd8, 0x97, 0x12, 0x42, 0x8f, 0xe1, 0x70, 0xc5,
+	0x28, 0x09, 0xc6, 0x13, 0x79, 0x11, 0x2d, 0x7c, 0xb0, 0x62, 0x34, 0x18, 0x4f, 0xc4, 0x23, 0x2d,
+	0x4a, 0xca, 0xa2, 0x30, 0xcb, 0x68, 0x2c, 0xa9, 0xb6, 0x70, 0x0d, 0x19, 0x7c, 0xd7, 0x84, 0x23,
+	0x75, 0xbf, 0x41, 0xae, 0x75, 0xf0, 0x63, 0xea, 0x3f, 0x84, 0xd3, 0x6d, 0xdf, 0x20, 0xf7, 0xda,
+	0xc1, 0xc3, 0x4d, 0xb7, 0x78, 0xbb, 0xed, 0x0b, 0xdf, 0xa7, 0x99, 0xc6, 0xdd, 0xea, 0x39, 0x43,
+	0xff, 0x83, 0x9a, 0xd9, 0xde, 0x29, 0x5b, 0x67, 0x91, 0x24, 0xdd, 0xac, 0xee, 0xd4, 0x5f, 0x67,
+	0x11, 0xfa, 0x0c, 0xba, 0xf3, 0x30, 0x49, 0x69, 0x5c, 0xbd, 0x58, 0x90, 0xc2, 0xef, 0x28, 0x50,
+	0x3d, 0x4e, 0xf4, 0x6b, 0xd8, 0x17, 0x1b, 0x33, 0xbb, 0x2d, 0x35, 0x57, 0x7b, 0xce, 0x3e, 0x65,
+	0x82, 0xa0, 0xb8, 0x12, 0x86, 0x95, 0x13, 0x7a, 0x09, 0xa6, 0x4c, 0xb9, 0xc8, 0x4b, 0x6e, 0x77,
+	0x64, 0xc6, 0x8f, 0x6b, 0x0d, 0xa0, 0x32, 0xc9, 0x31, 0xb1, 0xf5, 0x44, 0x9f, 0x8b, 0xf6, 0x73,
+	0x4b, 0x4b, 0x4e, 0x44, 0x57, 0xa7, 0x8c, 0xd9, 0x27, 0x52, 0x51, 0x5d, 0x85, 0x8e, 0x14, 0x88,
+	0x5e, 0x83, 0xbd, 0x0c, 0xd9, 0x4d, 0x95, 0x30, 0x61, 0xb4, 0xbc, 0xa5, 0x25, 0x91, 0x13, 0xe5,
+	0x54, 0x06, 0x9c, 0x2a, 0xbb, 0x6a, 0x33, 0xd2, 0x3a, 0x15, 0xe3, 0xe5, 0x63, 0x80, 0xdb, 0x57,
+	0x84, 0xad, 0x0a, 0x99, 0xd7, 0x23, 0xa5, 0x9e, 0xdb, 0x57, 0xbe, 0x02, 0xa4, 0xf9, 0xc5, 0xc6,
+	0xfc, 0x58, 0x9b, 0x5f, 0x54, 0xe6, 0xe7, 0xb0, 0x3f, 0x17, 0x2a, 0xb5, 0x6d, 0x79, 0x05, 0x4f,
+	0xb6, 0x84, 0xee, 0x09, 0x19, 0x2b, 0xcf, 0x0f, 0xe8, 0xff, 0xef, 0x62, 0xaa, 0x0c, 0xfd, 0xdf,
+	0x97, 0x61, 0x51, 0xd0, 0x52, 0xd4, 0x80, 0x5d, 0x87, 0xa5, 0xe8, 0x71, 0x34, 0x2a, 0x29, 0xd7,
+	0x83, 0xb6, 0xa3, 0x40, 0x5f, 0x62, 0x68, 0x02, 0x27, 0x65, 0xed, 0x24, 0x52, 0x84, 0x6b, 0x51,
+	0x44, 0xdd, 0x06, 0x3e, 0xba, 0xdb, 0x06, 0x36, 0x32, 0xc5, 0x0f, 0xeb, 0x61, 0x33, 0x15, 0x85,
+	0x2e, 0x61, 0x07, 0x26, 0x2c, 0x5f, 0x95, 0x11, 0xd5, 0xdd, 0xe1, 0xe9, 0xf7, 0x93, 0xf3, 0xa5,
+	0x0f, 0x46, 0xe5, 0x3d, 0x0c, 0x3d, 0xbf, 0x93, 0x5c, 0x55, 0x41, 0x35, 0xaa, 0x77, 0x8e, 0xaa,
+	0xea, 0xf8, 0x19, 0x74, 0x55, 0x01, 0x2b, 0xdf, 0x43, 0x45, 0x5a, 0x82, 0xda, 0x69, 0xf0, 0x6f,
+	0x03, 0x3a, 0x75, 0x89, 0xa1, 0xdf, 0xc2, 0xc9, 0x8e, 0x5c, 0x49, 0xb8, 0xcc, 0x57, 0x19, 0x97,
+	0x52, 0xe9, 0x62, 0x54, 0x57, 0xed, 0x48, 0x5a, 0xd0, 0x73, 0x38, 0xe5, 0x39, 0x0f, 0x53, 0x22,
+	0x46, 0x3d, 0xe1, 0x39, 0x89, 0xf2, 0x2c, 0xa3, 0x11, 0xb7, 0x3f, 0x51, 0x21, 0xd2, 0x18, 0x24,
+	0x4b, 0x1a, 0xe4, 0x8e, 0xb2, 0xa0, 0x9f, 0x41, 0xaf, 0xe4, 0x5c, 0xf8, 0xea, 0x66, 0x66, 0x7f,
+	0x2a, 0x7d, 0x3b, 0x25, 0xaf, 0x3d, 0xff, 0x3e, 0x74, 0xc4, 0xa0, 0xe3, 0xb9, 0xee, 0x47, 0x3f,
+	0xd7, 0xfd, 0x31, 0x65, 0x41, 0xae, 0x1a, 0x92, 0xf0, 0x88, 0x8a, 0xad, 0xc7, 0x2f, 0xb4, 0x47,
+	0x54, 0x68, 0x8f, 0x41, 0x06, 0xc7, 0x9b, 0xa9, 0x72, 0x41, 0x39, 0x8d, 0x78, 0x5e, 0x0a, 0x25,
+	0x56, 0x73, 0x3d, 0x29, 0xf4, 0x5f, 0x92, 0xa9, 0x91, 0x71, 0x81, 0x9e, 0x80, 0x19, 0xc9, 0x12,
+	0x0b, 0xeb, 0x9e, 0xfa, 0x87, 0x52, 0xc0, 0xb8, 0x10, 0xb1, 0xfa, 0x97, 0x86, 0x64, 0x4c, 0x6a,
+	0xa3, 0x89, 0x4d, 0x8d, 0x4c, 0xd9, 0xf9, 0xaf, 0xe0, 0x50, 0xff, 0xa0, 0xa1, 0x23, 0x68, 0x8f,
+	0x5c, 0x9f, 0xbc, 0x75, 0x2e, 0xc9, 0xf3, 0xe1, 0xef, 0xac, 0x3f, 0xd6, 0x81, 0xe1, 0xcb, 0x57,
+	0xd6, 0x9f, 0xce, 0xff, 0x63, 0x40, 0x6f, 0xb7, 0xbf, 0xa0, 0x63, 0xe8, 0x0a, 0x64, 0xea, 0x11,
+	0xe7, 0xcb, 0xd1, 0xf4, 0xad, 0x6b, 0x3d, 0x40, 0x27, 0x60, 0x09, 0xc8, 0x77, 0x7d, 0x7f, 0xec,
+	0x4d, 0xc9, 0x78, 0x3a, 0x0e, 0x2c, 0x03, 0x3d, 0x81, 0xc7, 0x75, 0xd4, 0xf1, 0xbe, 0x71, 0x71,
+	0xa0, 0x8c, 0x6d, 0x64, 0xc3, 0x89, 0x30, 0xba, 0x7f, 0x98, 0xb9, 0x4e, 0x40, 0xb0, 0xeb, 0x78,
+	0xd3, 0xa9, 0xeb, 0x04, 0xd6, 0x1e, 0x3a, 0x85, 0xe3, 0x9d, 0xb0, 0x89, 0xe7, 0xbb, 0x56, 0xa3,
+	0x3a, 0xe3, 0xfd, 0xd8, 0x9d, 0x5c, 0x90, 0x77, 0xb3, 0x89, 0x37, 0xba, 0xb0, 0x9a, 0xe8, 0x11,
+	0x20, 0x81, 0x8e, 0x9c, 0xaf, 0xdf, 0x8d, 0xb1, 0x5b, 0xe1, 0xfb, 0xa8, 0x0f, 0x4f, 0x6b, 0xdb,
+	0x2b, 0xd8, 0x9b, 0x4e, 0xde, 0xeb, 0x93, 0xac, 0x03, 0xd4, 0x03, 0x53, 0x7a, 0x60, 0xec, 0x61,
+	0xeb, 0xbf, 0xc6, 0xf9, 0x5f, 0x0d, 0xe8, 0xed, 0x4e, 0x5f, 0xc1, 0x54, 0x20, 0x77, 0x98, 0x0a,
+	0xe8, 0x3e, 0xd3, 0x3a, 0xba, 0xcb, 0xf4, 0x23, 0x38, 0x15, 0x46, 0xc7, 0x9b, 0x7e, 0x31, 0xc6,
+	0x97, 0x77, 0xa9, 0xee, 0xc4, 0x69, 0xaa, 0x3d, 0x30, 0x05, 0xbc, 0x49, 0xed, 0x1f, 0x06, 0xf4,
+	0x76, 0x47, 0x34, 0xea, 0x40, 0x6b, 0xea, 0x69, 0x8f, 0x07, 0xb2, 0x24, 0xea, 0x4c, 0x3f, 0xc0,
+	0xee, 0xe8, 0xd2, 0x32, 0xd0, 0x43, 0x38, 0x72, 0x26, 0x63, 0x77, 0x2a, 0xee, 0x76, 0xe6, 0xe1,
+	0xc0, 0xbd, 0xb0, 0xf6, 0x6a, 0xe0, 0x0c, 0x7b, 0x81, 0xe7, 0x78, 0x13, 0x75, 0xb1, 0x7e, 0x30,
+	0x0a, 0x14, 0x9d, 0xc0, 0xc5, 0xd3, 0xd1, 0xc4, 0x6a, 0x22, 0x04, 0xbd, 0x0b, 0xd7, 0xf1, 0xde,
+	0x13, 0xb1, 0xaf, 0xbe, 0x54, 0x71, 0x8c, 0x0a, 0xd7, 0xc7, 0xc4, 0xc2, 0x4d, 0x43, 0xc1, 0xf8,
+	0xd2, 0xf5, 0xde, 0x05, 0x16, 0x3d, 0xff, 0x0d, 0x74, 0x77, 0x1a, 0x3c, 0x6a, 0x41, 0x73, 0xba,
+	0x4a, 0x53, 0xeb, 0x01, 0x3a, 0x84, 0xc6, 0x65, 0x92, 0x59, 0x06, 0x32, 0x61, 0xdf, 0xbb, 0x9a,
+	0xb3, 0x17, 0xd6, 0xde, 0xf9, 0xd7, 0x80, 0xee, 0x77, 0x18, 0xa1, 0xc4, 0x77, 0x19, 0x2b, 0x68,
+	0x94, 0xcc, 0x13, 0x1a, 0x5b, 0x0f, 0x04, 0xe3, 0xea, 0x75, 0x58, 0x86, 0xd8, 0x68, 0x34, 0x1b,
+	0x2b, 0x4a, 0x15, 0x3c, 0x53, 0xa3, 0xda, 0x6a, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x98, 0x6e,
+	0x73, 0xc1, 0xd2, 0x0c, 0x00, 0x00,
 }

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

@@ -83,7 +83,7 @@ message ClientConf {
     optional DecoyList decoy_list = 1;
     optional uint32 generation = 2;
     optional PubKey default_pubkey = 3;
-    optional DarkDecoyBlocks dark_decoy_blocks = 4;
+    optional PhantomSubnetsList phantom_subnets_list = 4;
     optional PubKey conjure_pubkey = 5;
 }
 
@@ -91,8 +91,13 @@ message DecoyList {
     repeated TLSDecoySpec tls_decoys = 1;
 }
 
-message DarkDecoyBlocks{
-    repeated string blocks = 1;
+message PhantomSubnetsList{
+    repeated PhantomSubnets weighted_subnets = 1;
+}
+
+message PhantomSubnets{
+    optional uint32 weight = 1;
+    repeated string subnets = 2;
 }
 
 // State transitions of the client

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

@@ -14,6 +14,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	pb "github.com/refraction-networking/gotapdance/protobuf"
+	ps "github.com/refraction-networking/gotapdance/tapdance/phantoms"
 )
 
 type assets struct {
@@ -38,53 +39,75 @@ var assetsOnce sync.Once
 // First access to singleton sets path. Assets(), if called
 // before SetAssetsDir() sets path to "./assets/"
 func Assets() *assets {
-	_initAssets := func() { initAssets("./assets/") }
+	var err error
+	_initAssets := func() { err = initAssets("./assets/") }
 	assetsOnce.Do(_initAssets)
+	if err != nil {
+		Logger().Warnf("error getting assets: %v", err)
+	}
 	return assetsInstance
 }
 
 // AssetsSetDir sets the directory to read assets from.
 // Functionally equivalent to Assets() after initialization, unless dir changes.
-func AssetsSetDir(dir string) *assets {
-	_initAssets := func() { initAssets(dir) }
+func AssetsSetDir(dir string) (*assets, error) {
+	var err error
+	_initAssets := func() { err = initAssets(dir) }
 	if assetsInstance != nil {
 		assetsInstance.Lock()
 		defer assetsInstance.Unlock()
 		if dir != assetsInstance.path {
-			Logger().Warnf("Assets path changed %s->%s. (Re)initializing.\n",
-				assetsInstance.path, dir)
+
+			if _, err := os.Stat(dir); err != nil {
+				Logger().Warnf("Assets path unchanged %v.\n", err)
+				return assetsInstance, err
+			}
+			Logger().Warnf("Assets path changed %s->%s. (Re)initializing", assetsInstance.path, dir)
 			assetsInstance.path = dir
-			assetsInstance.readConfigs()
-			return assetsInstance
+			err = assetsInstance.readConfigs()
+			return assetsInstance, err
 		}
 	}
 	assetsOnce.Do(_initAssets)
-	return assetsInstance
+	return assetsInstance, err
 }
 
 func getDefaultKey() []byte {
-	// keyStr := "515868be7f45ab6f310afed4b229b7a479fc9fde553dea4ccdb369ab1899e70c"
 	keyStr := "a1cb97be697c5ed5aefd78ffa4db7e68101024603511e40a89951bc158807177"
 	key := make([]byte, hex.DecodedLen(len(keyStr)))
 	hex.Decode(key, []byte(keyStr))
 	return key
 }
 
-func initAssets(path string) {
+func getDefaultTapdanceKey() []byte {
+	keyStr := "515868be7f45ab6f310afed4b229b7a479fc9fde553dea4ccdb369ab1899e70c"
+	key := make([]byte, hex.DecodedLen(len(keyStr)))
+	hex.Decode(key, []byte(keyStr))
+	return key
+}
+
+func initAssets(path string) error {
 	var defaultDecoys = []*pb.TLSDecoySpec{
 		pb.InitTLSDecoySpec("192.122.190.104", "tapdance1.freeaeskey.xyz"),
 		pb.InitTLSDecoySpec("192.122.190.105", "tapdance2.freeaeskey.xyz"),
 		pb.InitTLSDecoySpec("192.122.190.106", "tapdance3.freeaeskey.xyz"),
 	}
 
-	defaultKey := getDefaultKey()
+	defaultKey := getDefaultTapdanceKey()
+	defaultConjureKey := getDefaultKey()
+
 	defualtKeyType := pb.KeyType_AES_GCM_128
 	defaultPubKey := pb.PubKey{Key: defaultKey, Type: &defualtKeyType}
-	defaultGeneration := uint32(0)
+	defaultConjurePubKey := pb.PubKey{Key: defaultConjureKey, Type: &defualtKeyType}
+
+	defaultGeneration := uint32(1)
 	defaultDecoyList := pb.DecoyList{TlsDecoys: defaultDecoys}
-	defaultClientConf := pb.ClientConf{DecoyList: &defaultDecoyList,
+	defaultClientConf := pb.ClientConf{
+		DecoyList:     &defaultDecoyList,
 		DefaultPubkey: &defaultPubKey,
-		Generation:    &defaultGeneration}
+		ConjurePubkey: &defaultConjurePubKey,
+		Generation:    &defaultGeneration,
+	}
 
 	assetsInstance = &assets{
 		path:               path,
@@ -93,7 +116,8 @@ func initAssets(path string) {
 		filenameClientConf: "ClientConf",
 		socksAddr:          "",
 	}
-	assetsInstance.readConfigs()
+	err := assetsInstance.readConfigs()
+	return err
 }
 
 func (a *assets) GetAssetsDir() string {
@@ -102,7 +126,7 @@ func (a *assets) GetAssetsDir() string {
 	return a.path
 }
 
-func (a *assets) readConfigs() {
+func (a *assets) readConfigs() error {
 	readRoots := func(filename string) error {
 		rootCerts, err := ioutil.ReadFile(filename)
 		if err != nil {
@@ -137,18 +161,21 @@ func (a *assets) readConfigs() {
 	rootsFilename := path.Join(a.path, a.filenameRoots)
 	err = readRoots(rootsFilename)
 	if err != nil {
-		Logger().Warningln("Assets: failed to read root ca file: " + err.Error())
+		Logger().Warn("Assets: failed to read root ca file: " + err.Error())
 	} else {
 		Logger().Infoln("X.509 root CAs successfully read from " + rootsFilename)
 	}
 
+	// Parse ClientConf for Decoys and Phantoms List
 	clientConfFilename := path.Join(a.path, a.filenameClientConf)
 	err = readClientConf(clientConfFilename)
 	if err != nil {
-		Logger().Warningln("Assets: failed to read ClientConf file: " + err.Error())
+		Logger().Warn("Assets: failed to read ClientConf file: " + err.Error())
 	} else {
 		Logger().Infoln("Client config successfully read from " + clientConfFilename)
 	}
+
+	return err
 }
 
 // Picks random decoy, returns Server Name Indication and addr in format ipv4:port
@@ -361,3 +388,34 @@ func (a *assets) saveClientConf() error {
 func (a *assets) SetStatsSocksAddr(addr string) {
 	a.socksAddr = addr
 }
+
+// GetPhantomSubnets -
+func (a *assets) GetPhantomSubnets() *pb.PhantomSubnetsList {
+	a.RLock()
+	defer a.RUnlock()
+
+	if a.config == nil {
+		return ps.GetDefaultPhantomSubnets()
+	}
+
+	if phantomSubnetsList := a.config.GetPhantomSubnetsList(); phantomSubnetsList != nil {
+		return phantomSubnetsList
+	}
+
+	return ps.GetDefaultPhantomSubnets()
+}
+
+// SetPhantomSubnets -
+func (a *assets) SetPhantomSubnets(subnetConf *pb.PhantomSubnetsList) error {
+	a.Lock()
+	defer a.Unlock()
+
+	if a.config == nil {
+		a.config = &pb.ClientConf{}
+	}
+
+	a.config.PhantomSubnetsList = subnetConf
+
+	err := a.saveClientConf()
+	return err
+}

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

@@ -948,15 +948,9 @@ func SelectDecoys(sharedSecret []byte, version uint, width uint) ([]*pb.TLSDecoy
 // 	{subnet: "35.8.0.0/16", weight: 10.0},
 // }
 
-var phantomSubnets = ps.SubnetConfig{
-	WeightedSubnets: []ps.ConjurePhantomSubnet{
-		{Weight: 9, Subnets: []string{"192.122.190.0/24", "2001:48a8:687f:1::/64"}},
-		{Weight: 1, Subnets: []string{"141.219.0.0/16", "35.8.0.0/16"}},
-	},
-}
-
 // SelectPhantom - select one phantom IP address based on shared secret
 func SelectPhantom(seed []byte, support uint) (*net.IP, *net.IP, error) {
+	phantomSubnets := Assets().GetPhantomSubnets()
 	switch support {
 	case v4:
 		phantomIPv4, err := ps.SelectPhantom(seed, phantomSubnets, ps.V4Only, true)

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

@@ -539,9 +539,7 @@ func (flowConn *TapdanceFlowConn) idStr() string {
 }
 
 func (flowConn *TapdanceFlowConn) processProto(msg *pb.StationToClient) error {
-	// //[TODO]{priority:after-placement-updates} uncomment to re-enable automatic clientconf downloads
-	//handleConfigInfo := func(conf *pb.ClientConf) {
-	_ = func(conf *pb.ClientConf) {
+	handleConfigInfo := func(conf *pb.ClientConf) {
 		currGen := Assets().GetGeneration()
 		if conf.GetGeneration() < currGen {
 			Logger().Infoln(flowConn.idStr()+" not appliying new config due"+
@@ -563,8 +561,7 @@ func (flowConn *TapdanceFlowConn) processProto(msg *pb.StationToClient) error {
 	Logger().Debugln(flowConn.idStr() + " processing incoming protobuf: " + msg.String())
 	// handle ConfigInfo
 	if confInfo := msg.ConfigInfo; confInfo != nil {
-		// //[TODO]{priority:after-placement-updates} uncomment to re-enable automatic clientconf downloads
-		// handleConfigInfo(confInfo)
+		handleConfigInfo(confInfo)
 		// TODO: if we ever get a ``safe'' decoy rotation - code below has to be rewritten
 		if !Assets().IsDecoyInList(flowConn.tdRaw.decoySpec) {
 			Logger().Warningln(flowConn.idStr() + " current decoy is no " +

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

@@ -10,21 +10,13 @@ import (
 	"net"
 
 	wr "github.com/mroth/weightedrand"
+	pb "github.com/refraction-networking/gotapdance/protobuf"
 )
 
-type ConjurePhantomSubnet struct {
-	Weight  float32
-	Subnets []string
-}
-
-type SubnetConfig struct {
-	WeightedSubnets []ConjurePhantomSubnet
-}
-
 // getSubnets - return EITHER all subnet strings as one composite array if we are
 //		selecting unweighted, or return the array associated with the (seed) selected
 //		array of subnet strings based on the associated weights
-func (sc *SubnetConfig) getSubnets(seed []byte, weighted bool) []string {
+func getSubnets(sc *pb.PhantomSubnetsList, seed []byte, weighted bool) []string {
 
 	var out []string = []string{}
 
@@ -36,16 +28,39 @@ func (sc *SubnetConfig) getSubnets(seed []byte, weighted bool) []string {
 		}
 		rand.Seed(seedInt)
 
-		choices := make([]wr.Choice, 0, len(sc.WeightedSubnets))
-		for _, cjSubnet := range sc.WeightedSubnets {
-			choices = append(choices, wr.Choice{Item: cjSubnet.Subnets, Weight: uint(cjSubnet.Weight)})
+		weightedSubnets := sc.GetWeightedSubnets()
+		if weightedSubnets == nil {
+			return []string{}
 		}
+
+		choices := make([]wr.Choice, 0, len(weightedSubnets))
+
+		// fmt.Println("DEBUG - len = ", len(weightedSubnets))
+		for _, cjSubnet := range weightedSubnets {
+			weight := cjSubnet.GetWeight()
+			subnets := cjSubnet.GetSubnets()
+			if subnets == nil {
+				continue
+			}
+			// fmt.Println("Adding Choice", subnets, weight)
+			choices = append(choices, wr.Choice{Item: subnets, Weight: uint(weight)})
+		}
+
 		c, _ := wr.NewChooser(choices...)
+		if c == nil {
+			return []string{}
+		}
+
 		out = c.Pick().([]string)
 	} else {
 
+		weightedSubnets := sc.GetWeightedSubnets()
+		if weightedSubnets == nil {
+			return []string{}
+		}
+
 		// Use unweighted config for subnets, concat all into one array and return.
-		for _, cjSubnet := range sc.WeightedSubnets {
+		for _, cjSubnet := range weightedSubnets {
 			for _, subnet := range cjSubnet.Subnets {
 				out = append(out, subnet)
 			}
@@ -70,13 +85,18 @@ func V4Only(obj []*net.IPNet) ([]*net.IPNet, error) {
 	return out, nil
 }
 
+// V6Only - a functor for transforming the subnet list to only include IPv6 subnets
 func V6Only(obj []*net.IPNet) ([]*net.IPNet, error) {
 	var out []*net.IPNet = []*net.IPNet{}
 
 	for _, _net := range obj {
-		if ipv6net := _net.IP.To16(); ipv6net != nil {
-			out = append(out, _net)
+		if _net.IP == nil {
+			continue
 		}
+		if net := _net.IP.To4(); net != nil {
+			continue
+		}
+		out = append(out, _net)
 	}
 	return out, nil
 }
@@ -207,9 +227,9 @@ func selectIPAddr(seed []byte, subnets []*net.IPNet) (*net.IP, error) {
 }
 
 // SelectPhantom - select one phantom IP address based on shared secret
-func SelectPhantom(seed []byte, subnets SubnetConfig, transform SubnetFilter, weighted bool) (*net.IP, error) {
+func SelectPhantom(seed []byte, subnetsList *pb.PhantomSubnetsList, transform SubnetFilter, weighted bool) (*net.IP, error) {
 
-	s, err := parseSubnets(subnets.getSubnets(seed, weighted))
+	s, err := parseSubnets(getSubnets(subnetsList, seed, weighted))
 	if err != nil {
 		return nil, fmt.Errorf("Failed to parse subnets: %v", err)
 	}
@@ -225,11 +245,29 @@ func SelectPhantom(seed []byte, subnets SubnetConfig, transform SubnetFilter, we
 }
 
 // SelectPhantomUnweighted - select one phantom IP address based on shared secret
-func SelectPhantomUnweighted(seed []byte, subnets SubnetConfig, transform SubnetFilter) (*net.IP, error) {
+func SelectPhantomUnweighted(seed []byte, subnets *pb.PhantomSubnetsList, transform SubnetFilter) (*net.IP, error) {
 	return SelectPhantom(seed, subnets, transform, false)
 }
 
 // SelectPhantomWeighted - select one phantom IP address based on shared secret
-func SelectPhantomWeighted(seed []byte, subnets SubnetConfig, transform SubnetFilter) (*net.IP, error) {
+func SelectPhantomWeighted(seed []byte, subnets *pb.PhantomSubnetsList, transform SubnetFilter) (*net.IP, error) {
 	return SelectPhantom(seed, subnets, transform, true)
 }
+
+// GetDefaultPhantomSubnets implements the
+func GetDefaultPhantomSubnets() *pb.PhantomSubnetsList {
+	var w1 = uint32(9.0)
+	var w2 = uint32(1.0)
+	return &pb.PhantomSubnetsList{
+		WeightedSubnets: []*pb.PhantomSubnets{
+			{
+				Weight:  &w1,
+				Subnets: []string{"192.122.190.0/24", "2001:48a8:687f:1::/64"},
+			},
+			{
+				Weight:  &w2,
+				Subnets: []string{"141.219.0.0/16", "35.8.0.0/16"},
+			},
+		},
+	}
+}

vendor/vendor.json

@@ -550,40 +550,40 @@
 			"tree": true
 		},
 		{
-			"checksumSHA1": "TtIN/5Wshp+L7WdSLIRLlH+QzYI=",
+			"checksumSHA1": "Tq3U98W2uwIgjWSjH7tqBonGjBE=",
 			"path": "github.com/refraction-networking/gotapdance",
-			"revision": "3b9150fdb0ba53a01f58adbfe29b1e49b0ccd2db",
-			"revisionTime": "2021-02-22T17:27:12Z"
+			"revision": "b563c6928d2acf9557ad6ffd4005e3c790822e3a",
+			"revisionTime": "2021-04-26T00:19:26Z"
 		},
 		{
 			"checksumSHA1": "ObZZJpjQl2BISlIiES82BW8jbEE=",
 			"path": "github.com/refraction-networking/gotapdance/ed25519/edwards25519",
-			"revision": "3b9150fdb0ba53a01f58adbfe29b1e49b0ccd2db",
-			"revisionTime": "2021-02-22T17:27:12Z"
+			"revision": "b563c6928d2acf9557ad6ffd4005e3c790822e3a",
+			"revisionTime": "2021-04-26T00:19:26Z"
 		},
 		{
 			"checksumSHA1": "VoyDh1KIIVE+OJbehDNJ91tf4Vw=",
 			"path": "github.com/refraction-networking/gotapdance/ed25519/extra25519",
-			"revision": "3b9150fdb0ba53a01f58adbfe29b1e49b0ccd2db",
-			"revisionTime": "2021-02-22T17:27:12Z"
+			"revision": "b563c6928d2acf9557ad6ffd4005e3c790822e3a",
+			"revisionTime": "2021-04-26T00:19:26Z"
 		},
 		{
-			"checksumSHA1": "0KryOirNgY6/K0W6tNDH97emng4=",
+			"checksumSHA1": "J0kNvH3uYnwnPEJQhaa5Y1TcbZI=",
 			"path": "github.com/refraction-networking/gotapdance/protobuf",
-			"revision": "3b9150fdb0ba53a01f58adbfe29b1e49b0ccd2db",
-			"revisionTime": "2021-02-22T17:27:12Z"
+			"revision": "b563c6928d2acf9557ad6ffd4005e3c790822e3a",
+			"revisionTime": "2021-04-26T00:19:26Z"
 		},
 		{
-			"checksumSHA1": "oV3lQZAOagZeIGr78it5ZDaYeIM=",
+			"checksumSHA1": "rPJAZXxZ5w5+ZnIPZGDFyp/uO6w=",
 			"path": "github.com/refraction-networking/gotapdance/tapdance",
-			"revision": "3b9150fdb0ba53a01f58adbfe29b1e49b0ccd2db",
-			"revisionTime": "2021-02-22T17:27:12Z"
+			"revision": "b563c6928d2acf9557ad6ffd4005e3c790822e3a",
+			"revisionTime": "2021-04-26T00:19:26Z"
 		},
 		{
-			"checksumSHA1": "fv2fYuM1BN+zb4/TEktcVTqKhnI=",
+			"checksumSHA1": "NiwZ/PirZniVT64D03KOS6UFMGU=",
 			"path": "github.com/refraction-networking/gotapdance/tapdance/phantoms",
-			"revision": "3b9150fdb0ba53a01f58adbfe29b1e49b0ccd2db",
-			"revisionTime": "2021-02-22T17:27:12Z"
+			"revision": "b563c6928d2acf9557ad6ffd4005e3c790822e3a",
+			"revisionTime": "2021-04-26T00:19:26Z"
 		},
 		{
 			"checksumSHA1": "OagdWaWcbCBQZR5bBGgGaK3nddE=",