Merge pull request #113 from gunnarhaslinger/master
authorAaron Zauner <azet@azet.org>
Fri, 16 Oct 2015 23:09:59 +0000 (01:09 +0200)
committerAaron Zauner <azet@azet.org>
Fri, 16 Oct 2015 23:09:59 +0000 (01:09 +0200)
commite06f7fe65a91e1173591ffb8faf3cdcfeb4855c7
tree224f5b498a2973547538235c63645b19e2f680f4
parentafb7ead4d1b5d7937c6e6e81e33cefc4591c3df1
parent1a8cb3a90791a25f3c05d9ba293bad6c46e8255e
Merge pull request #113 from gunnarhaslinger/master

HTTP Public Key Pinning (HPKP), added new theory section and updated Apache-Config.