[tor-commits] [tor-browser-bundle/master] Merge branch 'bug_15689_v3'