Merge ../Applied-Crypto-Hardening
authorAdi Kriegisch <adi@kriegisch.at>
Tue, 20 Dec 2016 14:20:52 +0000 (15:20 +0100)
committerAdi Kriegisch <adi@kriegisch.at>
Tue, 20 Dec 2016 14:20:52 +0000 (15:20 +0100)
commit6bb101d3ba98fbebbc1c7cb77916c351358ca39e
tree2985a3d5714c0c0b341589c59267681287cc6279
parent5215db8aaff3acb510bcc78b4aaf36f27c94acd1
parent87cbacb2a7719cf6fe5b9144ae37fbad2fe3e2bd
Merge ../Applied-Crypto-Hardening

Conflicts:
CONTRIBUTING.md
CONTRIBUTING.md