[tor-commits] [stem/master] Adjust import ordering