Merge branch 'master' into patch-1

This commit is contained in:
Omar Santos 2020-08-15 21:43:30 -04:00 committed by GitHub
commit 3f0afd13c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -12,6 +12,7 @@
- [AppSec Village](https://www.youtube.com/c/appsecvillage)
- [BlackHills InfoSec](https://www.youtube.com/channel/UCJ2U9Dq9NckqHMbcUupgF0A)
- [The Cyber Mentor](https://www.youtube.com/channel/UC0ArlFuFYMpEewyRBzdLHiw)
- [Security Weekly](https://www.youtube.com/user/SecurityWeeklyTV)
## Twitch
- [Red Team Village](https://twitch.tv/redteamvillage)
@ -22,3 +23,19 @@
- [HackerOne](https://www.twitch.tv/hackeronetv)
- [The Cyber Mentor](https://www.twitch.tv/thecybermentor)
## Podcasts
- [DarkNet Diaries](https://darknetdiaries.com/)
- [Security Weekly](https://securityweekly.com/)
- [Risky Business](https://risky.biz/netcasts/risky-business/)
- [The Unsupervised Learning Podcast](https://danielmiessler.com/podcast/#gs.=RDc3aY)
- [Down the Security Rabbithole](http://podcast.wh1t3rabbit.net/)
- [Smashing Security](https://www.smashingsecurity.com/)
- [The Cyberwire](https://thecyberwire.com/)
- [The CyberJungle](http://www.thecyberjungle.com/)
- [Beer with Talos](https://talosintelligence.com/podcasts/shows/beers_with_talos)
- [Talos Takes](https://talosintelligence.com/podcasts/shows/talos_takes)
- [Open Source Security Podcast](https://opensourcesecurity.io/category/podcast/)
- [Crypto-Gram Security Podcast](http://crypto-gram.libsyn.com/)