[tbb-commits] [tor-browser/tor-browser-31.2.0esr-4.x-1] Merge remote-tracking branch 'brade/bug13301' into tor-browser-31.2.0esr-4.x-1

[mikeperry at torproject.org]

commit 1c33659d907bcfdb9f6f06383942b1f57c3abcfe
Merge: 6cb68a4 bc7f012
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Oct 23 18:19:53 2014 -0700

    Merge remote-tracking branch 'brade/bug13301' into tor-browser-31.2.0esr-4.x-1

 toolkit/mozapps/update/content/updates.js |   35 +++++++++++++++++++++++++----
 toolkit/mozapps/update/jar.mn             |    2 +-
 2 files changed, 32 insertions(+), 5 deletions(-)