[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'gk/bug_15539_v4'