[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'mikeperry/bug15672'