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