commit 6d15c68167a45cca12ab5e7bcb8781d1de535e80 Merge: c1bde57 6803874 Author: Georg Koppen <gk@torproject.org> Date: Thu Aug 20 12:59:57 2015 +0200 Merge remote-tracking branch 'pc/bug16781-01' into tor-browser-38.2.0esr-5.5-1 browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)