[tor-commits] [tor/master] Minor changes to adhere to codebase conventions.