Skip to content

Commit

Permalink
bump trojan version and sync config file
Browse files Browse the repository at this point in the history
  • Loading branch information
JimLee1996 committed Nov 21, 2020
1 parent fe79815 commit d4be68e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion TrojanX/Credits.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
\pard\tx560\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
{\field{\*\fldinst{HYPERLINK "https://github.com/trojan-gfw/trojan"}}{\fldrslt
\f0\fs24 \cf0 trojan}}
\f0\fs24 v1.15.1\
\f0\fs24 v1.16.0\
\pard\tx560\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
{\field{\*\fldinst{HYPERLINK "https://www.privoxy.org/"}}{\fldrslt \cf0 privoxy}} v3.0.26}
2 changes: 1 addition & 1 deletion TrojanX/LaunchAgentUtils.swift
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func writeSSLocalConfFile(profile: ServerProfile) -> Bool {
let conf_local = "{\"run_type\":\"client\",\"local_addr\":\"" + local_addr + "\",\"local_port\":" + local_port
let conf_remote = ",\"remote_addr\":\"" + remote_addr + "\",\"remote_port\":" + remote_port
let conf_pass = ",\"password\":[\"" + password + "\"],"
let conf_other = "\"log_level\":2,\"ssl\":{\"verify\":false,\"verify_hostname\":false,\"cert\":\"\",\"cipher\":\"\",\"cipher_tls13\":\"TLS_CHACHA20_POLY1305_SHA256\",\"sni\":\"\",\"alpn\":[\"h2\"],\"reuse_session\":true,\"session_ticket\":false,\"curves\":\"\"},\"tcp\":{\"no_delay\":true,\"keep_alive\":true,\"reuse_port\":false,\"fast_open\":false,\"fast_open_qlen\":20}}"
let conf_other = "\"log_level\":1,\"ssl\":{\"verify\":false,\"verify_hostname\":false,\"cert\":\"\",\"cipher\":\"\",\"cipher_tls13\":\"TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256\",\"sni\":\"\",\"alpn\":[\"h2\"],\"reuse_session\":true,\"session_ticket\":false,\"curves\":\"\"},\"tcp\":{\"no_delay\":true,\"keep_alive\":true,\"reuse_port\":false,\"fast_open\":false,\"fast_open_qlen\":20}}"

let confJson = conf_local + conf_remote + conf_pass + conf_other

Expand Down
Binary file modified TrojanX/trojan
Binary file not shown.

0 comments on commit d4be68e

Please sign in to comment.