[tor-commits] [tor/master] and fix them here too