[tor-commits] [tor/master] Fix issues in 3630 patch noted by Karsten