Merge pull request #1 from nmathewson/master

同步上游