[tor-commits] [torbutton/master] Merge remote branch 'origin/master'