Merge remote-tracking branch 'origin/trunk'
add script for fetching and merging remote changes; remove old notes
Merge remote-tracking branch 'origin/trunk'
Merge branch 'master' of github.com:calfzhou/autoproxy-gfwlist