[3.6] bpo-31234: Fix dangling thread in test_ftp/poplib#3554

vstinner merged 2 commits intopython:3.6python/cpython:3.6from

vstinner:test_ftplib36Copy head branch name to clipboard