[tbb-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'brade/bug16236-01' into tor-browser-38.1.0esr-5.0-1

[mikeperry at torproject.org]

commit 5ba1b3465b136c061afca8fdcfd38ccf77b02d88
Merge: 41a0771 b7a65a6
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Jul 27 08:57:50 2015 -0700

    Merge remote-tracking branch 'brade/bug16236-01' into tor-browser-38.1.0esr-5.0-1

 toolkit/mozapps/update/updater/updater.cpp |    9 ++++++++-
 toolkit/xre/nsUpdateDriver.cpp             |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)