[tor-commits] [support-portal/master] Merge edits from Alison