Merge branch 'filinpavel-patch-8'

This commit is contained in:
Nick Raienko 2014-12-29 23:31:58 +02:00
commit 09fba86be0

View File

@ -195,6 +195,8 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
### Security Courses ### Security Courses
* [Offensive Security Training](http://www.offensive-security.com/information-security-training/) - Training from BackTrack/Kali developers * [Offensive Security Training](http://www.offensive-security.com/information-security-training/) - Training from BackTrack/Kali developers
* [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
* [CTF Field Guide](https://trailofbits.github.io/ctf/) - everything you need to win your next CTF competition
### Information Security Conferences ### Information Security Conferences