Merge branch 'filinpavel-patch-17'

This commit is contained in:
Nick Raienko 2015-02-03 20:18:34 +02:00
commit 5eb2f961be

View File

@ -207,6 +207,7 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
* [SANS Security Training](http://www.sans.org/) - Computer Security Training & Certification * [SANS Security Training](http://www.sans.org/) - Computer Security Training & Certification
* [Open Security Training](http://opensecuritytraining.info/) - Training material for computer security classes * [Open Security Training](http://opensecuritytraining.info/) - Training material for computer security classes
* [CTF Field Guide](https://trailofbits.github.io/ctf/) - everything you need to win your next CTF competition * [CTF Field Guide](https://trailofbits.github.io/ctf/) - everything you need to win your next CTF competition
* [Cybrary](https://www.cybrary.it/) - online IT and Cyber Security training platform
### Information Security Conferences ### Information Security Conferences