Merge remote-tracking branch 'upstream/master'

Author: cconlon

.gitignore

@@ -242,6 +242,13 @@ pk/ed448/*.der
 pk/curve25519/curve25519_test
 pk/hpke/hpke_test
 
+
+# Post-Quantum Stateful Hash-Based Signatures.
+pq/stateful_hash_sig/xmss_example
+pq/stateful_hash_sig/xmss_example.key
+pq/stateful_hash_sig/lms_example
+pq/stateful_hash_sig/lms_example.key
+
 embedded/tls-client-server
 embedded/tls-server-size
 embedded/tls-sock-client