[tor-commits] [tor/master] touchups on 78582760