Commit Graph
2329 Commits
Author SHA1 Message Date
John 2a249b0bac added support for Docker secrets and password file in the Docker image
this means we no longer have to hardcode the password in the docker-compose file, and can treat the file as configuration rather than a secret.
2020-09-19 16:10:26 -02:30
Max Lv 8285e5a7de Bump version v3.3.5 2020-09-15 10:30:48 +08:00
babarosaM33 a727596faa jconf: fix memory leak 2020-08-04 21:56:45 +08:00
Max Lv 31dd81649d Merge pull request #2736 from zfl9/master
Add TPROXY support for TCP (ss-redir)
2020-07-20 16:24:19 +08:00
zfl9 03df264fcd add tcp_tproxy option, add a sample script in readme.md 2020-07-18 21:09:08 +08:00
zfl9 cde88d4074 add tcp_tproxy option, README.md update 2020-07-18 17:10:37 +08:00
zfl9 6d4a3ad82c add tcp_tproxy option, asciidoc update 2020-07-18 17:08:56 +08:00
zfl9 37cdf8d45a add tcp_tproxy option, completions bash/zsh 2020-07-18 17:00:18 +08:00
zfl9 78784507f1 add tcp_tproxy option, use tproxy instead of redirect (tcp) 2020-07-18 16:23:21 +08:00
Max Lv cab663a6a2 Merge pull request #2733 from DDoSolitary/patch-cygwin-tcp.h-detect
Fix detection of netinet/tcp.h on Cygwin.
2020-07-14 09:19:55 +08:00
DDoSolitary 54fa88476c Fix detection of netinet/tcp.h on Cygwin. 2020-07-13 17:45:16 +08:00
Max Lv 1b90919f06 Merge pull request #2730 from billzhong/patch-1
fix broken anchor
2020-07-04 12:51:47 +08:00
Bill Zhong 982f1e1d1e fix broken anchor 2020-07-04 00:47:51 -02:30
Max Lv a360b2cc43 Merge pull request #2728 from ipcjs/master
add snap service
2020-07-01 09:14:53 +08:00
ipcjs-rog-ubuntu cd6ac18772 add snap service 2020-06-27 04:09:13 +08:00
Max Lv 25be24c01f Align the report format for UDP packet 2020-06-20 06:56:31 +08:00
Max Lv e8ca659cea report suspicious UDP packet for fail2ban 2020-06-20 06:45:37 +08:00
Max Lv 163cd3db60 Merge pull request #2720 from morlay/master
Fix workflow build to make docker release with tags or edge for master
2020-06-16 16:08:18 +08:00
Morlay b3762a461a fix workflow build to make docker release with tags or edge for master 2020-06-16 15:27:45 +08:00
Max Lv 99645ffafc Merge pull request #2719 from morlay/master
added workflow for buildx
2020-06-16 13:06:16 +08:00
Morlay 1bde4621b9 added workflow for buildx 2020-06-16 11:32:32 +08:00
Max Lv 3ff9d33898 Merge pull request #2698 from DDoSolitary/patch-cmake-mingw
Fix support for building with CMake and MinGW.
2020-05-02 15:15:25 +08:00
DDoSolitary 93336adf66 Fix static linking issues on Windows. 2020-05-02 13:36:38 +08:00
DDoSolitary f1f3e9d6ca Fix support for building with CMake and MinGW. 2020-05-02 13:25:11 +08:00
Max Lv 597ceec262 Merge pull request #2697 from hxzh/master
Add ss-manager read manager_address argurment from config file
2020-05-02 12:49:02 +08:00
root 02f25e588c add ss-manager read manager_address from config.json 2020-05-02 10:57:36 +08:00
Max Lv bc77b6189c Merge pull request #2694 from wangxinhe2006/master
Add `xchacha20-ietf-poly1305` to docs and completions
2020-04-29 11:37:29 +08:00
Max Lv 236c98d6d9 Merge pull request #2685 from JamisHoo/master
Also apply LIB_ONLY for dynamic library, fix #2443
2020-04-29 11:37:16 +08:00
汪心禾 2ae8006ee3 *Shadowsocks-libev* accepts 19 different ciphers 2020-04-29 09:50:03 +08:00
汪心禾 2cc92827e5 xchacha20-ietf-poly1305 doc 2020-04-28 15:44:20 +08:00
汪心禾 1e7bb4512c xchacha20-ietf-poly1305 completion 2020-04-28 15:43:55 +08:00
Max Lv aa9fe8cceb Fix #2692 2020-04-27 09:44:22 +08:00
Max Lv 401d323480 Merge pull request #2691 from rogers0/PR/fix_debian_rules
debian/rules: Fix #2675
2020-04-18 21:14:45 +08:00
Roger Shimizu 5f947a8466 debian/rules: Fix #2675
Regression caused by commit [0d96da4].
2020-04-18 21:21:07 +09:00
Max Lv 9ea9aa0368 Merge pull request #2690 from Loyalsoldier/update-telegram-CIDR
Update telegram CIDR
2020-04-18 11:08:46 +08:00
loyalsoldier 4d33f01042 Update telegram CIDR
Update telegram CIDR according to https://core.telegram.org/resources/cidr.txt
2020-04-18 10:05:30 +08:00
Max Lv 1d78159613 Merge pull request #2688 from Loyalsoldier/update-acl
Update ACL files
2020-04-18 08:26:17 +08:00
loyalsoldier 1e5d55777d Update gfwlist on 2020.04.18 2020-04-18 01:47:34 +08:00
loyalsoldier d258132414 Update local IPs 2020-04-18 01:35:20 +08:00
loyalsoldier 1cce832bef Update China Mainland IPv4
Update China Mainland IPv4 according to @17mon/china_ip_list
2020-04-18 01:35:15 +08:00
Max Lv 33a1932023 Fix #2687 2020-04-17 13:42:30 +08:00
Max Lv 870f9d914d Merge pull request #2686 from shadowsocks/rm-fedora-copr-librehat
Remove the unmaintained Fedora COPR section
2020-04-14 19:45:29 +08:00
Symeon Huang 4baff35e25 Remove the unmaintained Fedora COPR section
I'm no longer maintaining the packages for Fedora and RHEL. This PR seeks to remove this section to avoid confusions.
2020-04-14 12:43:38 +01:00
Jamis Hoo bbb2849b60 Also apply LIB_ONLY for shared library, fix #2443 2020-04-13 22:08:43 +08:00
Max Lv cc658e49cb Merge pull request #2674 from cyber386/work
Update public libraries
2020-03-31 06:03:18 +08:00
cyber368 bab75a877a Update public libraries 2020-03-31 00:09:58 +08:00
Max Lv 34f1bbed5b Merge pull request #2673 from JamisHoo/master
cmake: fix build issues when this project is built as dependency of other CMake projects
2020-03-29 18:51:45 +08:00
Max Lv 2cdcb41fa8 Merge pull request #2672 from rogers0/PR/sync_debian
Sync debian/ folder with debian version 3.3.4+ds-3
2020-03-29 18:08:51 +08:00
Jamis Hoo 138186b3db Add include_directories property for shared_libraries 2020-03-29 17:35:22 +08:00
Jamis Hoo 0aa55a29e5 Replace CMAKE_XXX_DIR with PROJECT_XXX_DIR, so that this project can be used in an enclosing project 2020-03-29 17:35:12 +08:00