Checkpoint work in preparation for move to Python 3 so that we can have SNI support.