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)
HTTP Public Key Pinning (HPKP), added new theory section and updated Apache-Config.


Trivial merge