[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'arthur/15899' into tor-browser-31.6.0esr-4.5-1

[mikeperry at torproject.org]

commit 31c6bfb7ef8eb79fe526ceaece91d6236f8cdd8a
Merge: 3006aa5 15bf754
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed May 6 19:42:54 2015 -0700

    Merge remote-tracking branch 'arthur/15899' into tor-browser-31.6.0esr-4.5-1

 browser/extensions/pdfjs/content/build/pdf.worker.js |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)