[tor-commits] [torbrowser/maint-2.2] Tweak + merge Shondoit's Bug 4795 patch.