Merge pull request #6 from liangrockman2/master

8.12 commit
Merge pull request #3 from liangrockman/master

Merge To guantao repo
Merge pull request #7 from liangrockman2/master

8.13 commit
Merge pull request #4 from liangrockman/master

Merge To guantao repo
注释
Merge pull request #8 from liangrockman2/master

new file
Merge pull request #6 from liangrockman/master

test
Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
Merge pull request #9 from guantaozhou/master

Update
Merge pull request #1 from liangrockman/master

test
The real test server script
Merge remote-tracking branch 'origin/master'
Merge pull request #10 from jamantai/master

Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFi...
Merge pull request #2 from liangrockman/master

真是测试环境
The real test server script
Merge remote-tracking branch 'origin/master'
Merge pull request #3 from liangrockman/master

get file
The real test server script
Merge pull request #11 from jamantai/master

Merge pull request #2 from liangrockman/master
Merge pull request #8 from liangrockman/master

修改了trackingServer！