[tor-commits] [tor/master] Incorporate some comments based on notes from dgoulet