[tor-commits] [tor/maint-0.2.2] remove some (confusing) dead code