[tor-commits] [tpo/master] two more changes requested in #209