[tbb-commits] [tor-browser/tor-browser-31.2.0esr-4.5-1] Merge remote-tracking branch 'brade/bug13594-01' into tor-browser-31.2.0esr-4.5-1

[mikeperry at torproject.org]

commit d67c094300a4adaf8b930d52646597e34b5dfac4
Merge: be0ac86 a9ccc52
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Nov 4 18:39:51 2014 -0800

    Merge remote-tracking branch 'brade/bug13594-01' into tor-browser-31.2.0esr-4.5-1

 toolkit/xre/nsUpdateDriver.cpp |   46 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)