diff --git a/.gitignore b/.gitignore index 2ed89497..c27d189b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.sublime* cow-proxy +bin diff --git a/README-en.md b/README-en.md index db5d0758..b90c75b9 100644 --- a/README-en.md +++ b/README-en.md @@ -2,7 +2,7 @@ COW is a HTTP proxy to simplify bypassing the great firewall. It tries to automatically identify blocked websites and only use parent proxy for those sites. -Current version: 0.9.6 [CHANGELOG](CHANGELOG) +Current version: 0.9.7 [CHANGELOG](CHANGELOG) [![Build Status](https://travis-ci.org/cyfdecyf/cow.png?branch=develop)](https://travis-ci.org/cyfdecyf/cow) ## Features @@ -22,7 +22,8 @@ Install: curl -L git.io/cow | bash -- **Windows:** [download](http://dl.chenyufei.info/cow/) + - All binaries are compiled on OS X, if ARM binary can't work, please download [Go ARM](https://storage.googleapis.com/golang/go1.6.2.linux-amd64.tar.gz) and install from source. +- **Windows:** download from the [release page](https://github.com/cyfdecyf/cow/releases) - If you are familiar with Go, run `go get github.com/cyfdecyf/cow` to install from source. Modify configuration file `~/.cow/rc` (OS X or Linux) or `rc.txt` (Windows). A simple example with the most important options: diff --git a/README.md b/README.md index 56200a1e..9cd5287f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ COW 是一个简化穿墙的 HTTP 代理服务器。它能自动检测被墙网 [English README](README-en.md). -当前版本:0.9.6 [CHANGELOG](CHANGELOG) +当前版本:0.9.7 [CHANGELOG](CHANGELOG) [![Build Status](https://travis-ci.org/cyfdecyf/cow.png?branch=develop)](https://travis-ci.org/cyfdecyf/cow) **欢迎在 develop branch 进行开发并发送 pull request :)** @@ -29,7 +29,8 @@ COW 的设计目标是自动化,理想情况下用户无需关心哪些网站 curl -L git.io/cow | bash - 环境变量 `COW_INSTALLDIR` 可以指定安装的路径,若该环境变量不是目录则询问用户 -- **Windows:** [点此下载](http://dl.chenyufei.info/cow/) + - 所有 binary 在 OS X 上编译获得,若 ARM 版本可能无法工作,请下载 [Go ARM](https://storage.googleapis.com/golang/go1.6.2.linux-amd64.tar.gz) 后从源码安装 +- **Windows:** 从 [release 页面](https://github.com/cyfdecyf/cow/releases)下载 - 熟悉 Go 的用户可用 `go get github.com/cyfdecyf/cow` 从源码安装 编辑 `~/.cow/rc` (Linux) 或 `rc.txt` (Windows),简单的配置例子如下: diff --git a/config.go b/config.go index b66e1e95..eaf581ad 100644 --- a/config.go +++ b/config.go @@ -16,7 +16,7 @@ import ( ) const ( - version = "0.9.6" + version = "0.9.7" defaultListenAddr = "127.0.0.1:7777" defaultEstimateTarget = "example.com" ) diff --git a/doc/sample-config/rc b/doc/sample-config/rc index 484dd019..362f16fc 100644 --- a/doc/sample-config/rc +++ b/doc/sample-config/rc @@ -66,7 +66,9 @@ listen = http://127.0.0.1:7777 # # shadowsocks: # proxy = ss://encrypt_method:password@1.2.3.4:8388 +# proxy = ss://encrypt_method-auth:password@1.2.3.4:8388 # +# encrypt_method 添加 -auth 启用 One Time Auth # authinfo 中指定加密方法和密码,所有支持的加密方法如下: # aes-128-cfb, aes-192-cfb, aes-256-cfb, # bf-cfb, cast5-cfb, des-cfb, rc4-md5, diff --git a/doc/sample-config/rc-en b/doc/sample-config/rc-en index ee2857d9..206bcf6c 100644 --- a/doc/sample-config/rc-en +++ b/doc/sample-config/rc-en @@ -74,7 +74,9 @@ listen = http://127.0.0.1:7777 # # shadowsocks: # proxy = ss://encrypt_method:password@1.2.3.4:8388 +# proxy = ss://encrypt_method-auth:password@1.2.3.4:8388 # +# Append -auth to encrypt_method to enable One Time Auth. # authinfo specifies encryption method and password. # Here are the supported encryption methods: # diff --git a/install-cow.sh b/install-cow.sh index 29f8a70a..22586d2f 100755 --- a/install-cow.sh +++ b/install-cow.sh @@ -1,6 +1,6 @@ #!/bin/bash -version=0.9.6 +version=0.9.7 arch=`uname -m` case $arch in @@ -90,7 +90,7 @@ fi bin=cow-$os$arch-$version tmpdir=`mktemp -d /tmp/cow.XXXXXX` tmpbin=$tmpdir/cow -binary_url="http://dl.chenyufei.info/cow/$version/$bin.gz" +binary_url="https://github.com/cyfdecyf/cow/releases/download/$version/$bin.gz" echo "Downloading cow binary $binary_url to $tmpbin.gz" curl -L "$binary_url" -o $tmpbin.gz || \ exit_on_fail "Downloading cow binary failed"