Merge remote-tracking branch 'origin/master'

This commit is contained in:
clowwindy 2013-07-09 20:54:49 +08:00
commit 2f0222aa00
2 changed files with 4 additions and 3 deletions

View file

@ -30,7 +30,7 @@ Create a file named `config.json`, with the following content.
"local_port":1080, "local_port":1080,
"password":"barfoo!", "password":"barfoo!",
"timeout":600, "timeout":600,
"method":null "method":"table"
} }
Explaination of the fields: Explaination of the fields:
@ -92,10 +92,11 @@ List of all encryption methods:
Ubuntu: Ubuntu:
sudo apt-get install python-m2crypto apt-get install python-m2crypto
Others: Others:
apt-get install openssl-dev swig
pip install M2Crypto pip install M2Crypto
Please notice that some encryption methods are not available on some environments. Please notice that some encryption methods are not available on some environments.

View file

@ -4,5 +4,5 @@
"local_port":1080, "local_port":1080,
"password":"barfoo!", "password":"barfoo!",
"timeout":600, "timeout":600,
"method":null "method":"table"
} }