[tor-commits] [manual/master] Merge master