[tor-commits] [arm/master] More fixes for issues caught by weasel