commit b0cd4e20527b9c1fc603ab1b18a5f36ffc3f726f Merge: 4424293 e4eca47 Author: Mike Perry <mikeperry-git@torproject.org> Date: Mon Sep 22 20:19:28 2014 -0700 Merge remote-tracking branch 'brade/bug13047-03' into tor-browser-24.8.0esr-4.x-1 browser/app/profile/firefox.js | 2 +- toolkit/mozapps/update/nsUpdateService.js | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-)