[tor-commits] [tor-browser-spec/master] Merge branch !6 into master

[gk at torproject.org]

commit 62045ea62ab28d8b1e9c25b7dc2b5ebdb509e145
Merge: f857ef5 1b265d8
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Sep 3 08:04:26 2020 +0000

    Merge branch !6 into master

 .../xxx-canvas-tainting-for-fp-resistance.txt      | 134 +++++++++++++++++++++
 1 file changed, 134 insertions(+)