In the commit message, can you please use the syntax:

Co-Authored-By: full name <name@example.com>

Rather than GitHub names? For me, it's:

Co-Authored-By: Victor Stinner <victor.stinner@gmail.com>

Commit message:
"Introduced by 1abcf67"

Hum, it was also introduced by 6b4be19. I propose:

Fix regressions introduced by:

- bpo-18520: commit 8fea252a507024edf00d5d98881d22dc8799a8d3
- bpo-22257: commits 1abcf6700b4da6207fe859de40c6c1bada6b4fec and 6b4be195cd8868b76eb6fbe166acc39beee8ce36

LGTM, let's see if all tests pass ;-)

I suggest you to revert the warnoptions change and let it open, since it seems tricky to fix it.

You reverted the warnoptions change, but you forgot to update the commit message: your change is not related to "- bpo-18520: commit 8fea252".

Ok, it should now pass on Travis CI but it doesn't fix the refleak in warnoptions. It's a compromise :-)