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