[tor-commits] [tor-browser-build/master] Merge branch 'bug_25000'

commit 448a263c986e4b824c5b4b205268e97fed88eb0c Merge: 166edad 229bd55 Author: Georg Koppen gk@torproject.org Date: Wed Feb 21 07:13:32 2018 +0000

Merge branch 'bug_25000'

.../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)