[tbb-commits] [tor-browser/tor-browser-68.7.0esr-9.5-1] Merge branch 'bradetpo/bug32418-01' into tor-browser-68.7.0esr-9.5-1

[sysrqb at torproject.org]

commit f81583b0d6d7eefd4b7384e8ee95d528ea4fb303
Merge: 5a8128b566fa e577d655d204
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue Apr 28 20:04:14 2020 +0000

    Merge branch 'bradetpo/bug32418-01' into tor-browser-68.7.0esr-9.5-1

 .../enterprisepolicies/EnterprisePolicies.js       | 32 ++++++++++++++++++++--
 toolkit/components/enterprisepolicies/moz.build    |  4 ++-
 toolkit/mozapps/update/UpdateService.jsm           | 20 ++++++++++++++
 3 files changed, 52 insertions(+), 4 deletions(-)