[tbb-commits] [tor-browser/tor-browser-38.4.0esr-5.5-1] Merge remote-tracking branch 'arthur/17446+2' into tor-browser-38.4.0esr-5.5-1

[gk at torproject.org]

commit b501eedc0b4b8018f930fdaf3fc5d0116fab0b14
Merge: c429e39 57ff8d6
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Nov 16 13:13:05 2015 +0000

    Merge remote-tracking branch 'arthur/17446+2' into tor-browser-38.4.0esr-5.5-1

 dom/canvas/CanvasUtils.cpp |  179 +++++++++++++++++++++++---------------------
 1 file changed, 95 insertions(+), 84 deletions(-)