Merge branch 'pq-crystals:master' into dev1linux

Author: quannguyen247

LICENSE

@@ -1,5 +1,5 @@
 Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
-or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html) or GPL 2.0 License (http://www.gnu.org/licenses/gpl-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources