add timeout support in DNS; close #138
Merge branch 'master' of github.com:clowwindy/shadowsocks
bump
Merge branch 'dev'