Merge pull request #89 from binarymist/conferences-upstream

Added CHCon to conferences.
This commit is contained in:
Samar Dhwoj Acharya 2016-12-26 14:48:55 -06:00 committed by GitHub
commit b51a71af91

View File

@ -346,6 +346,7 @@ A collection of awesome penetration testing resources
* [PhreakNIC](http://phreaknic.info/) - A technology conference held annually in middle Tennessee * [PhreakNIC](http://phreaknic.info/) - A technology conference held annually in middle Tennessee
* [ShmooCon](http://shmoocon.org/) - An annual US east coast hacker convention * [ShmooCon](http://shmoocon.org/) - An annual US east coast hacker convention
* [CarolinaCon](http://www.carolinacon.org/) - An infosec conference, held annually in North Carolina * [CarolinaCon](http://www.carolinacon.org/) - An infosec conference, held annually in North Carolina
* [CHCon](https://chcon.nz) - Christchurch Hacker Con, Only South Island of New Zealand hacker con
* [SummerCon](http://www.summercon.org/) - One of the oldest hacker conventions, held during Summer * [SummerCon](http://www.summercon.org/) - One of the oldest hacker conventions, held during Summer
* [Hack.lu](https://2016.hack.lu/) - An annual conference held in Luxembourg * [Hack.lu](https://2016.hack.lu/) - An annual conference held in Luxembourg
* [HITB](https://conference.hitb.org/) - Deep-knowledge security conference held in Malaysia and The Netherlands * [HITB](https://conference.hitb.org/) - Deep-knowledge security conference held in Malaysia and The Netherlands