v2ray 3376ea078d merge conflict

2016-06-05 23:42:16 +02:00

..

config_json_test.go

support using specific address

2016-06-04 00:38:22 +02:00

config_json.go

support using specific address

2016-06-04 00:38:22 +02:00

config.go

support using specific address

2016-06-04 00:38:22 +02:00

errors.go

Rename BadConfiguration to ErrorBadConfiguration

2016-01-30 12:12:57 +01:00

inbound_detour_always.go

organize handler metadata

2016-06-04 14:25:13 +02:00

inbound_detour_dynamic.go

merge conflict

2016-06-05 23:42:16 +02:00

inbound_detour.go

rename InboundConnectionHandler to InboundHandler

2016-01-25 17:18:24 +01:00

point.go

organize handler metadata

2016-06-04 14:25:13 +02:00