[tor-commits] [oonib/master] Clean up imports