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