[tor-commits] [community/master] Fix style and order issues