From 024957eeffbf010a97e8a277a12190f14e8722a3 Mon Sep 17 00:00:00 2001 From: Chen Yufei Date: Sun, 21 Sep 2014 12:29:29 +0800 Subject: [PATCH 1/3] Remove MS sites in direct list. --- site_direct.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/site_direct.go b/site_direct.go index 1e9ae777..eed66344 100644 --- a/site_direct.go +++ b/site_direct.go @@ -112,12 +112,6 @@ var directDomainList = []string{ "apple.com.cn", "icloud.com", - // 微软 - "hotmail.com", - "live.com", - "outlook.com", - "microsoft.com", - // 其他 "macromedia.com", "mmcdn.cn", From 0c917a1446a5de917c6ef6e4566629d10d066368 Mon Sep 17 00:00:00 2001 From: Chen Yufei Date: Sun, 21 Sep 2014 20:58:21 +0800 Subject: [PATCH 2/3] Add rc4-md5 encryption method in sample rc. --- doc/sample-config/rc | 2 +- doc/sample-config/rc-en | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/sample-config/rc b/doc/sample-config/rc index 1fec7347..11c34805 100644 --- a/doc/sample-config/rc +++ b/doc/sample-config/rc @@ -67,7 +67,7 @@ listen = http://127.0.0.1:7777 # # authinfo 中指定加密方法和密码，所有支持的加密方法如下： # aes-128-cfb, aes-192-cfb, aes-256-cfb, -# bf-cfb, cast5-cfb, des-cfb, table, rc4 +# bf-cfb, cast5-cfb, des-cfb, rc4-md5, rc4, table # 推荐使用 aes-128-cfb # # cow: diff --git a/doc/sample-config/rc-en b/doc/sample-config/rc-en index a7315a87..5e0c3523 100644 --- a/doc/sample-config/rc-en +++ b/doc/sample-config/rc-en @@ -79,7 +79,7 @@ listen = http://127.0.0.1:7777 # Here are the supported encryption methods: # # aes-128-cfb, aes-192-cfb, aes-256-cfb, -# bf-cfb, cast5-cfb, des-cfb, table, rc4 +# bf-cfb, cast5-cfb, des-cfb, rc4-md5, rc4, table # # aes-128-cfb is recommended. # From 90dd86a06ef6c2684d3e0e082c39344ec6592991 Mon Sep 17 00:00:00 2001 From: Chen Yufei Date: Sun, 21 Sep 2014 20:59:59 +0800 Subject: [PATCH 3/3] Bump version to 0.9.3 --- CHANGELOG | 3 +++ README.md | 2 +- config.go | 2 +- install-cow.sh | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 62839460..5a8a8b04 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +0.9.2 (2014-09-21) + * Support new encryption method "rc4-md5" + 0.9.2 (2014-07-23) * Reduce the possibility of encountering too many open file error * New connection latency based load balancing diff --git a/README.md b/README.md index 98ddba7c..da9d9b6b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ COW 是一个简化穿墙的 HTTP 代理服务器。它能自动检测被墙网 [English README](README-en.md). -当前版本：0.9.2 [CHANGELOG](CHANGELOG) +当前版本：0.9.3 [CHANGELOG](CHANGELOG) [![Build Status](https://travis-ci.org/cyfdecyf/cow.png?branch=develop)](https://travis-ci.org/cyfdecyf/cow) **欢迎在 develop branch 进行开发并发送 pull request :)** diff --git a/config.go b/config.go index 22d74836..3e7a11ba 100644 --- a/config.go +++ b/config.go @@ -15,7 +15,7 @@ import ( ) const ( - version = "0.9.2" + version = "0.9.3" defaultListenAddr = "127.0.0.1:7777" ) diff --git a/install-cow.sh b/install-cow.sh index dd7e6398..63254464 100755 --- a/install-cow.sh +++ b/install-cow.sh @@ -1,6 +1,6 @@ #!/bin/bash -version=0.9.2 +version=0.9.3 arch=`uname -m` case $arch in