Sergei Maklagin 8388abbb77 Resolve conflicts

2025-07-13 21:44:23 +03:00

..

badtls

badtls: Support uTLS and TLS ECH for read waiter

2024-05-18 17:22:14 +08:00

badversion

Migrate contentjson and badjson to library &

2024-01-03 12:21:37 +08:00

cloudflare

refactor: WARP

2025-06-08 19:51:17 +03:00

conntrack

Improve conntrack

2023-09-20 14:15:00 +08:00

dialer

Fix slowOpenConn

2025-06-12 08:05:04 +08:00

geoip

Fix geoip close

2024-01-02 14:31:23 +08:00

geosite

WTF is this

2024-10-13 13:07:01 +08:00

interrupt

Fix interrupt_exist_connections

2025-06-15 19:32:14 +03:00

ja3

Improve QUIC sniffer

2024-10-13 13:07:02 +08:00

listener

Migrate bad options to library

2025-01-13 15:14:29 +08:00

mux

Fix lint

2025-01-13 15:14:30 +08:00

pipelistener

Add shadowsocks-multiuser control api

2022-07-27 21:59:40 +08:00

process

Fix: macOS udp find process should use unspecified fallback

2025-06-18 08:34:59 +08:00

redir

Fix ipv6 redir port

2023-02-05 14:48:02 +08:00

settings

Fix system time

2025-01-13 15:14:30 +08:00

sniff

Fix sniffer errors override each others

2025-04-22 14:44:55 +08:00

srs

Refactor multi networks strategy

2025-01-13 15:14:30 +08:00

taskmonitor

Avoid opening log output before start &

2024-01-03 12:21:46 +08:00

tls

Fix logger for acme

2025-06-29 18:44:40 +08:00

uot

Crazy sekai overturns the small pond

2025-01-13 15:14:29 +08:00

urltest

Add unified delay

2025-06-15 19:24:09 +03:00

xray

Fix Range

2025-06-15 22:21:58 +03:00