Revisions to `ntor.py` and `connection.py`