[tor-commits] [stem/master] Make tests pass with python 3.6