Merge proposals dependent on lp://staging/~zseil/pyopenssl/bwcompat-c-api

lp://staging/~zseil/pyopenssl/bwcompat-c-api has no merge proposals.