[tor-commits] [tor/master] More issues that Karsten spotted