Merge branch 'clean-up-test-runner' of https://github.com/alex/pyopenssl into clean-up-test-runner