[tor-commits] [tor/master] Remove some dead code, found by clang