Merge pull request #517 from gavinandresen/DoSprevention