Merge branch 'develop', version 0.9.3

cyfdecyf · Sep 21, 2014 · 113b96e · 113b96e
2 parents c817bd5 + 90dd86a
commit 113b96e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git 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
@@ -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=master)](https://travis-ci.org/cyfdecyf/cow)
 
 **欢迎在 develop branch 进行开发并发送 pull request :)**

diff --git 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/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
@@ -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.
 #

diff --git 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

diff --git 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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ import ( @@
     )
     const (
-    	version           = "0.9.2"
+    	version           = "0.9.3"
     	defaultListenAddr = "127.0.0.1:7777"
     )
@@ Expand Down @@