[Tails-dev] merging back tails_htp changes back upstream

WątekAutorData ()
Mproper
Mintrigeri