Skip to content

Commit cd5bf9b

Browse files
smallprogramsmallprogram
committed
Merge remote-tracking branch 'origin/main' into temp-openwrt
2 parents 54e5638 + 26fbb21 commit cd5bf9b

11 files changed

Lines changed: 22 additions & 11 deletions

File tree

‎config/immortalwrt_config/R2S.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7658,8 +7658,10 @@ CONFIG_PACKAGE_naiveproxy=y
76587658
# CONFIG_PACKAGE_radicale3 is not set
76597659
CONFIG_PACKAGE_redsocks2=y
76607660
CONFIG_PACKAGE_shadow-tls=y
7661+
CONFIG_PACKAGE_shadowsocks-libev-config=y
76617662
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
76627663
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
7664+
# CONFIG_PACKAGE_shadowsocks-libev-ss-rules is not set
76637665
CONFIG_PACKAGE_shadowsocks-libev-ss-server=y
76647666
# CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel is not set
76657667
CONFIG_PACKAGE_shadowsocks-rust-sslocal=y
@@ -8069,7 +8071,6 @@ CONFIG_PACKAGE_tcping=y
80698071
# CONFIG_PACKAGE_tor-basic is not set
80708072
# CONFIG_PACKAGE_trafficshaper is not set
80718073
# CONFIG_PACKAGE_travelmate is not set
8072-
CONFIG_PACKAGE_trojan-plus=y
80738074
# CONFIG_PACKAGE_tunneldigger is not set
80748075
# CONFIG_PACKAGE_tunneldigger-broker is not set
80758076
# CONFIG_PACKAGE_u2pnpd is not set

‎config/immortalwrt_config/R3S.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7659,8 +7659,10 @@ CONFIG_PACKAGE_naiveproxy=y
76597659
# CONFIG_PACKAGE_radicale3 is not set
76607660
CONFIG_PACKAGE_redsocks2=y
76617661
CONFIG_PACKAGE_shadow-tls=y
7662+
CONFIG_PACKAGE_shadowsocks-libev-config=y
76627663
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
76637664
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
7665+
# CONFIG_PACKAGE_shadowsocks-libev-ss-rules is not set
76647666
CONFIG_PACKAGE_shadowsocks-libev-ss-server=y
76657667
# CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel is not set
76667668
CONFIG_PACKAGE_shadowsocks-rust-sslocal=y
@@ -8070,7 +8072,6 @@ CONFIG_PACKAGE_tcping=y
80708072
# CONFIG_PACKAGE_tor-basic is not set
80718073
# CONFIG_PACKAGE_trafficshaper is not set
80728074
# CONFIG_PACKAGE_travelmate is not set
8073-
CONFIG_PACKAGE_trojan-plus=y
80748075
# CONFIG_PACKAGE_tunneldigger is not set
80758076
# CONFIG_PACKAGE_tunneldigger-broker is not set
80768077
# CONFIG_PACKAGE_u2pnpd is not set

‎config/immortalwrt_config/R4S.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7659,8 +7659,10 @@ CONFIG_PACKAGE_naiveproxy=y
76597659
# CONFIG_PACKAGE_radicale3 is not set
76607660
CONFIG_PACKAGE_redsocks2=y
76617661
CONFIG_PACKAGE_shadow-tls=y
7662+
CONFIG_PACKAGE_shadowsocks-libev-config=y
76627663
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
76637664
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
7665+
# CONFIG_PACKAGE_shadowsocks-libev-ss-rules is not set
76647666
CONFIG_PACKAGE_shadowsocks-libev-ss-server=y
76657667
# CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel is not set
76667668
CONFIG_PACKAGE_shadowsocks-rust-sslocal=y
@@ -8070,7 +8072,6 @@ CONFIG_PACKAGE_tcping=y
80708072
# CONFIG_PACKAGE_tor-basic is not set
80718073
# CONFIG_PACKAGE_trafficshaper is not set
80728074
# CONFIG_PACKAGE_travelmate is not set
8073-
CONFIG_PACKAGE_trojan-plus=y
80748075
# CONFIG_PACKAGE_tunneldigger is not set
80758076
# CONFIG_PACKAGE_tunneldigger-broker is not set
80768077
# CONFIG_PACKAGE_u2pnpd is not set

‎config/immortalwrt_config/R4SE.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7659,8 +7659,10 @@ CONFIG_PACKAGE_naiveproxy=y
76597659
# CONFIG_PACKAGE_radicale3 is not set
76607660
CONFIG_PACKAGE_redsocks2=y
76617661
CONFIG_PACKAGE_shadow-tls=y
7662+
CONFIG_PACKAGE_shadowsocks-libev-config=y
76627663
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
76637664
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
7665+
# CONFIG_PACKAGE_shadowsocks-libev-ss-rules is not set
76647666
CONFIG_PACKAGE_shadowsocks-libev-ss-server=y
76657667
# CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel is not set
76667668
CONFIG_PACKAGE_shadowsocks-rust-sslocal=y
@@ -8070,7 +8072,6 @@ CONFIG_PACKAGE_tcping=y
80708072
# CONFIG_PACKAGE_tor-basic is not set
80718073
# CONFIG_PACKAGE_trafficshaper is not set
80728074
# CONFIG_PACKAGE_travelmate is not set
8073-
CONFIG_PACKAGE_trojan-plus=y
80748075
# CONFIG_PACKAGE_tunneldigger is not set
80758076
# CONFIG_PACKAGE_tunneldigger-broker is not set
80768077
# CONFIG_PACKAGE_u2pnpd is not set

‎config/immortalwrt_config/R5C.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7671,8 +7671,10 @@ CONFIG_PACKAGE_naiveproxy=y
76717671
# CONFIG_PACKAGE_radicale3 is not set
76727672
CONFIG_PACKAGE_redsocks2=y
76737673
CONFIG_PACKAGE_shadow-tls=y
7674+
CONFIG_PACKAGE_shadowsocks-libev-config=y
76747675
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
76757676
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
7677+
# CONFIG_PACKAGE_shadowsocks-libev-ss-rules is not set
76767678
CONFIG_PACKAGE_shadowsocks-libev-ss-server=y
76777679
# CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel is not set
76787680
CONFIG_PACKAGE_shadowsocks-rust-sslocal=y
@@ -8088,7 +8090,6 @@ CONFIG_PACKAGE_tcping=y
80888090
# CONFIG_PACKAGE_tor-basic is not set
80898091
# CONFIG_PACKAGE_trafficshaper is not set
80908092
# CONFIG_PACKAGE_travelmate is not set
8091-
CONFIG_PACKAGE_trojan-plus=y
80928093
# CONFIG_PACKAGE_tunneldigger is not set
80938094
# CONFIG_PACKAGE_tunneldigger-broker is not set
80948095
# CONFIG_PACKAGE_u2pnpd is not set

‎config/immortalwrt_config/R5S.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7658,8 +7658,10 @@ CONFIG_PACKAGE_naiveproxy=y
76587658
# CONFIG_PACKAGE_radicale3 is not set
76597659
CONFIG_PACKAGE_redsocks2=y
76607660
CONFIG_PACKAGE_shadow-tls=y
7661+
CONFIG_PACKAGE_shadowsocks-libev-config=y
76617662
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
76627663
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
7664+
# CONFIG_PACKAGE_shadowsocks-libev-ss-rules is not set
76637665
CONFIG_PACKAGE_shadowsocks-libev-ss-server=y
76647666
# CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel is not set
76657667
CONFIG_PACKAGE_shadowsocks-rust-sslocal=y
@@ -8069,7 +8071,6 @@ CONFIG_PACKAGE_tcping=y
80698071
# CONFIG_PACKAGE_tor-basic is not set
80708072
# CONFIG_PACKAGE_trafficshaper is not set
80718073
# CONFIG_PACKAGE_travelmate is not set
8072-
CONFIG_PACKAGE_trojan-plus=y
80738074
# CONFIG_PACKAGE_tunneldigger is not set
80748075
# CONFIG_PACKAGE_tunneldigger-broker is not set
80758076
# CONFIG_PACKAGE_u2pnpd is not set

‎config/immortalwrt_config/R66S.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7658,8 +7658,10 @@ CONFIG_PACKAGE_naiveproxy=y
76587658
# CONFIG_PACKAGE_radicale3 is not set
76597659
CONFIG_PACKAGE_redsocks2=y
76607660
CONFIG_PACKAGE_shadow-tls=y
7661+
CONFIG_PACKAGE_shadowsocks-libev-config=y
76617662
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
76627663
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
7664+
# CONFIG_PACKAGE_shadowsocks-libev-ss-rules is not set
76637665
CONFIG_PACKAGE_shadowsocks-libev-ss-server=y
76647666
# CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel is not set
76657667
CONFIG_PACKAGE_shadowsocks-rust-sslocal=y
@@ -8069,7 +8071,6 @@ CONFIG_PACKAGE_tcping=y
80698071
# CONFIG_PACKAGE_tor-basic is not set
80708072
# CONFIG_PACKAGE_trafficshaper is not set
80718073
# CONFIG_PACKAGE_travelmate is not set
8072-
CONFIG_PACKAGE_trojan-plus=y
80738074
# CONFIG_PACKAGE_tunneldigger is not set
80748075
# CONFIG_PACKAGE_tunneldigger-broker is not set
80758076
# CONFIG_PACKAGE_u2pnpd is not set

‎config/immortalwrt_config/R68S.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7658,8 +7658,10 @@ CONFIG_PACKAGE_naiveproxy=y
76587658
# CONFIG_PACKAGE_radicale3 is not set
76597659
CONFIG_PACKAGE_redsocks2=y
76607660
CONFIG_PACKAGE_shadow-tls=y
7661+
CONFIG_PACKAGE_shadowsocks-libev-config=y
76617662
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
76627663
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
7664+
# CONFIG_PACKAGE_shadowsocks-libev-ss-rules is not set
76637665
CONFIG_PACKAGE_shadowsocks-libev-ss-server=y
76647666
# CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel is not set
76657667
CONFIG_PACKAGE_shadowsocks-rust-sslocal=y
@@ -8069,7 +8071,6 @@ CONFIG_PACKAGE_tcping=y
80698071
# CONFIG_PACKAGE_tor-basic is not set
80708072
# CONFIG_PACKAGE_trafficshaper is not set
80718073
# CONFIG_PACKAGE_travelmate is not set
8072-
CONFIG_PACKAGE_trojan-plus=y
80738074
# CONFIG_PACKAGE_tunneldigger is not set
80748075
# CONFIG_PACKAGE_tunneldigger-broker is not set
80758076
# CONFIG_PACKAGE_u2pnpd is not set

‎config/immortalwrt_config/R6C.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7658,8 +7658,10 @@ CONFIG_PACKAGE_naiveproxy=y
76587658
# CONFIG_PACKAGE_radicale3 is not set
76597659
CONFIG_PACKAGE_redsocks2=y
76607660
CONFIG_PACKAGE_shadow-tls=y
7661+
CONFIG_PACKAGE_shadowsocks-libev-config=y
76617662
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
76627663
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
7664+
# CONFIG_PACKAGE_shadowsocks-libev-ss-rules is not set
76637665
CONFIG_PACKAGE_shadowsocks-libev-ss-server=y
76647666
# CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel is not set
76657667
CONFIG_PACKAGE_shadowsocks-rust-sslocal=y
@@ -8069,7 +8071,6 @@ CONFIG_PACKAGE_tcping=y
80698071
# CONFIG_PACKAGE_tor-basic is not set
80708072
# CONFIG_PACKAGE_trafficshaper is not set
80718073
# CONFIG_PACKAGE_travelmate is not set
8072-
CONFIG_PACKAGE_trojan-plus=y
80738074
# CONFIG_PACKAGE_tunneldigger is not set
80748075
# CONFIG_PACKAGE_tunneldigger-broker is not set
80758076
# CONFIG_PACKAGE_u2pnpd is not set

‎config/immortalwrt_config/R6S.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7658,8 +7658,10 @@ CONFIG_PACKAGE_naiveproxy=y
76587658
# CONFIG_PACKAGE_radicale3 is not set
76597659
CONFIG_PACKAGE_redsocks2=y
76607660
CONFIG_PACKAGE_shadow-tls=y
7661+
CONFIG_PACKAGE_shadowsocks-libev-config=y
76617662
CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
76627663
CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
7664+
# CONFIG_PACKAGE_shadowsocks-libev-ss-rules is not set
76637665
CONFIG_PACKAGE_shadowsocks-libev-ss-server=y
76647666
# CONFIG_PACKAGE_shadowsocks-libev-ss-tunnel is not set
76657667
CONFIG_PACKAGE_shadowsocks-rust-sslocal=y
@@ -8069,7 +8071,6 @@ CONFIG_PACKAGE_tcping=y
80698071
# CONFIG_PACKAGE_tor-basic is not set
80708072
# CONFIG_PACKAGE_trafficshaper is not set
80718073
# CONFIG_PACKAGE_travelmate is not set
8072-
CONFIG_PACKAGE_trojan-plus=y
80738074
# CONFIG_PACKAGE_tunneldigger is not set
80748075
# CONFIG_PACKAGE_tunneldigger-broker is not set
80758076
# CONFIG_PACKAGE_u2pnpd is not set

0 commit comments

Comments
 (0)