Merge pull request #2316 from pyca/pypy-2.6.1

upgrade to pypy 2.6.1