[tor-commits] [torbutton/master] Merge remote-tracking branch 'isis/bug12684-additional-canvas-ui-strings_squashed'