Reorganize some sprawling categories, fix a ToC link, heading levels.

This commit fixes several minor issues including the heading levels for
sections such as RE tools, and fixes a broken link to the Online Social
Engineering Resources section, and correctly alphabetizing sections.

It also begins the process of culling the rather uncatgorized "other
lists elsewhere" section by inserting "see also" links to those other
lists in the appropriate section of this Awesome List, as is standard
Awesome List practice.

Additionally, this commit reorganizes several tools into clearer
categories by creating subcategories (for Tor tools, for instance) or
moving subcategories to their own top-level categories (exfil tools).

README.md

@@ -10,7 +10,9 @@ Your contributions and suggestions are heartily♥ welcome. (✿◕‿◕). Plea
 
 ## Contents
 
+* [Android Utilities](#android-utilities)
 * [Anonymity Tools](#anonymity-tools)
+  * [Tor Tools](#tor-tools)
 * [Anti-virus Evasion Tools](#anti-virus-evasion-tools)
 * [Books](#books)
   * [Defensive Programming Books](#defensive-programming-books)
@@ -33,15 +35,17 @@ Your contributions and suggestions are heartily♥ welcome. (✿◕‿◕). Plea
 * [Docker Containers](#docker-containers)
   * [Docker Containers of Intentionally Vulnerable Systems](#docker-containers-of-intentionally-vulnerable-systems)
   * [Docker Containers of Penetration Testing Distributions and Tools](#docker-containers-of-penetration-testing-distributions-and-tools)
+* [Exfiltration Tools](#exfiltration-tools)
+* [Exploit Development Tools](#exploit-development-tools)
 * [File Format Analysis Tools](#file-format-analysis-tools)
 * [GNU/Linux Utilities](#gnulinux-utilities)
 * [Hash Cracking Tools](#hash-cracking-tools)
 * [Hex Editors](#hex-editors)
 * [Industrial Control and SCADA Systems](#industrial-control-and-scada-systems)
+* [macOS Utilities](#macos-utilities)
 * [Multi-paradigm Frameworks](#multi-paradigm-frameworks)
 * [Network Tools](#network-tools)
   * [DDoS Tools](#ddos-tools)
-  * [Exfiltration Tools](#exfiltration-tools)
   * [Network Reconnaissance Tools](#network-reconnaissance-tools)
   * [Protocol Analyzers and Sniffers](#protocol-analyzers-and-sniffers)
   * [Network Traffic Replay and Editing Tools](#network-traffic-replay-and-editing-tools)
@@ -76,21 +80,31 @@ Your contributions and suggestions are heartily♥ welcome. (✿◕‿◕). Plea
 * [Side-channel Tools](#side-channel-tools)
 * [Social Engineering Tools](#social-engineering-tools)
 * [Static Analyzers](#static-analyzers)
+* [Steganography Tools](#steganography-tools)
 * [Vulnerability Databases](#vulnerability-databases)
 * [Web Exploitation](#web-exploitation)
-* [Android Utilities](#android-utilities)
 * [Windows Utilities](#windows-utilities)
-* [macOS Utilities](#macos-utilities)
+
+## Android Utilities
+
+* [Android Open Pwn Project (AOPP)](https://www.pwnieexpress.com/aopp) - Variant of the Android Open Source Project (AOSP), called Pwnix, is built from the ground up for network hacking and pentesting.
+* [cSploit](https://www.csploit.org/) - Advanced IT security professional toolkit on Android featuring an integrated Metasploit daemon and MITM capabilities.
+* [Fing](https://www.fing.com/products/fing-app/) - Network scanning and host enumeration app that performs NetBIOS, UPnP, Bonjour, SNMP, and various other advanced device fingerprinting techniques.
 
 ## Anonymity Tools
 
 * [I2P](https://geti2p.net/) - The Invisible Internet Project.
 * [Metadata Anonymization Toolkit (MAT)](https://0xacab.org/jvoisin/mat2) - Metadata removal tool, supporting a wide range of commonly used file formats, written in Python3.
+* [What Every Browser Knows About You](http://webkay.robinlinus.com/) - Comprehensive detection page to test your own Web browser's configuration for privacy and identity leaks.
+
+### Tor Tools
+
+See also [awesome-tor](https://github.com/ajvb/awesome-tor).
+
 * [Nipe](https://github.com/GouveaHeitor/nipe) - Script to redirect all traffic from the machine to the Tor network.
 * [OnionScan](https://onionscan.org/) - Tool for investigating the Dark Web by finding operational security issues introduced by Tor hidden service operators.
 * [Tails](https://tails.boum.org/) - Live operating system aiming to preserve your privacy and anonymity.
 * [Tor](https://www.torproject.org/) - Free software and onion routed overlay network that helps you defend against traffic analysis.
-* [What Every Browser Knows About You](http://webkay.robinlinus.com/) - Comprehensive detection page to test your own Web browser's configuration for privacy and identity leaks.
 * [dos-over-tor](https://github.com/skizap/dos-over-tor) - Proof of concept denial of service over Tor stress test tool.
 * [kalitorify](https://github.com/brainfuckSec/kalitorify) - Transparent proxy through Tor for Kali Linux OS.
 
@@ -166,14 +180,14 @@ See also [DEF CON Suggested Reading](https://www.defcon.org/html/links/book-list
 * [Unauthorised Access: Physical Penetration Testing For IT Security Teams by Wil Allsopp, 2010](http://www.amazon.com/Unauthorised-Access-Physical-Penetration-Security-ebook/dp/B005DIAPKE)
 * [Violent Python by TJ O'Connor, 2012](https://www.elsevier.com/books/violent-python/unknown/978-1-59749-957-6)
 
-### Privilege Escalation Tools
+## Privilege Escalation Tools
 
 * [Active Directory and Privilege Escalation (ADAPE)](https://github.com/hausec/ADAPE-Script) - Umbrella script that automates numerous useful PowerShell modules to discover security misconfigurations and attempt privilege escalation against Active Directory.
 * [LinEnum](https://github.com/rebootuser/LinEnum) - Scripted local Linux enumeration and privilege escalation checker useful for auditing a host and during CTF gaming.
 * [Postenum](https://github.com/mbahadou/postenum) - Shell script used for enumerating possible privilege escalation opportunities on a local GNU/Linux system.
 * [unix-privesc-check](https://github.com/pentestmonkey/unix-privesc-check) - Shell script to check for simple privilege escalation vectors on UNIX systems.
 
-### Reverse Engineering Books
+## Reverse Engineering Books
 
 * [Gray Hat Hacking The Ethical Hacker's Handbook by Daniel Regalado et al., 2015](http://www.amazon.com/Hacking-Ethical-Hackers-Handbook-Edition/dp/0071832386)
 * [Hacking the Xbox by Andrew Huang, 2003](https://nostarch.com/xbox.htm)
@@ -197,7 +211,7 @@ See also [DEF CON Suggested Reading](https://www.defcon.org/html/links/book-list
 
 ## CTF Tools
 
-* [Pwntools](https://github.com/Gallopsled/pwntools) - Rapid exploit development framework built for use in CTFs.
+* [CTF Field Guide](https://trailofbits.github.io/ctf/) - Everything you need to win your next CTF competition.
 * [RsaCtfTool](https://github.com/Ganapati/RsaCtfTool) - Decrypt data enciphered using weak RSA keys, and recover private keys from public keys using a variety of automated attacks.
 * [ctf-tools](https://github.com/zardus/ctf-tools) - Collection of setup scripts to install various security research tools easily and quickly deployable to new machines.
 * [shellpop](https://github.com/0x00-0x00/shellpop) - Easily generate sophisticated reverse or bind shell commands to help you save time during penetration tests.
@@ -212,6 +226,7 @@ See also [DEF CON Suggested Reading](https://www.defcon.org/html/links/book-list
 ## Conferences and Events
 
 * [BSides](http://www.securitybsides.com/) - Framework for organising and holding security conferences.
+* [CTFTime.org](https://ctftime.org/) - Directory of upcoming and archive of past Capture The Flag (CTF) competitions with links to challenge writeups.
 
 ### Asia
 
@@ -289,6 +304,23 @@ See also [DEF CON Suggested Reading](https://www.defcon.org/html/links/book-list
 * [Security Ninjas](https://hub.docker.com/r/opendns/security-ninjas/) - `docker pull opendns/security-ninjas`.
 * [docker-metasploit](https://hub.docker.com/r/phocean/msf/) - `docker pull phocean/msf`.
 
+## Exfiltration Tools
+
+* [DET](https://github.com/sensepost/DET) - Proof of concept to perform data exfiltration using either single or multiple channel(s) at the same time.
+* [Iodine](https://code.kryo.se/iodine/) - Tunnel IPv4 data through a DNS server; useful for exfiltration from networks where Internet access is firewalled, but DNS queries are allowed.
+* [TrevorC2](https://github.com/trustedsec/trevorc2) - Client/server tool for masking command and control and data exfiltration through a normally browsable website, not typical HTTP POST requests.
+* [dnscat2](https://github.com/iagox86/dnscat2) - Tool designed to create an encrypted command and control channel over the DNS protocol, which is an effective tunnel out of almost every network.
+* [pwnat](https://github.com/samyk/pwnat) - Punches holes in firewalls and NATs.
+* [tgcd](http://tgcd.sourceforge.net/) - Simple Unix network utility to extend the accessibility of TCP/IP based network services beyond firewalls.
+
+## Exploit Development Tools
+
+See also *[Reverse Engineering Tools](#reverse-engineering-tools)*.
+
+* [Pwntools](https://github.com/Gallopsled/pwntools) - Rapid exploit development framework built for use in CTFs.
+* [peda](https://github.com/longld/peda) - Python Exploit Development Assistance for GDB.
+* [Wordpress Exploit Framework](https://github.com/rastating/wordpress-exploit-framework) - Ruby framework for developing and using modules which aid in the penetration testing of WordPress powered websites and systems.
+
 ## File Format Analysis Tools
 
 * [ExifTool](https://www.sno.phy.queensu.ca/~phil/exiftool/) - Platform-independent Perl library plus a command-line application for reading, writing and editing meta information in a wide variety of files.
@@ -315,7 +347,6 @@ See also [DEF CON Suggested Reading](https://www.defcon.org/html/links/book-list
 * [JWT Cracker](https://github.com/lmammino/jwt-cracker) - Simple HS256 JSON Web Token (JWT) token brute force cracker.
 * [John the Ripper](http://www.openwall.com/john/) - Fast password cracker.
 * [Rar Crack](http://rarcrack.sourceforge.net) - RAR bruteforce cracker.
-* [StegCracker](https://github.com/Paradoxis/StegCracker) - Steganography brute-force utility to uncover hidden data inside files.
 
 ## Hex Editors
 
@@ -335,6 +366,11 @@ See also [awesome-industrial-control-system-security](https://github.com/hslatma
 * [Industrial Exploitation Framework (ISF)](https://github.com/dark-lbp/isf) - Metasploit-like exploit framework based on routersploit designed to target Industrial Control Systems (ICS), SCADA devices, PLC firmware, and more.
 * [s7scan](https://github.com/klsecservices/s7scan) - Scanner for enumerating Siemens S7 PLCs on a TCP/IP or LLC network.
 
+## macOS Utilities
+
+* [Bella](https://github.com/kdaoudieh/Bella) - Pure Python post-exploitation data mining and remote administration tool for macOS.
+* [EvilOSX](https://github.com/Marten4n6/EvilOSX) - Modular RAT that uses numerous evasion and exfiltration techniques out-of-the-box.
+
 ## Multi-paradigm Frameworks
 
 * [Armitage](http://fastandeasyhacking.com/) - Java-based GUI front-end for the Metasploit Framework.
@@ -376,16 +412,6 @@ See also [awesome-industrial-control-system-security](https://github.com/hslatma
 * [T50](https://gitlab.com/fredericopissarra/t50/) - Faster network stress tool.
 * [UFONet](https://github.com/epsylon/ufonet) - Abuses OSI layer 7 HTTP to create/manage 'zombies' and to conduct different attacks using; `GET`/`POST`, multithreading, proxies, origin spoofing methods, cache evasion techniques, etc.
 
-### Exfiltration Tools
-
-* [Cloakify](https://github.com/TryCatchHCF/Cloakify) - Textual steganography toolkit that converts any filetype into lists of everyday strings.
-* [DET](https://github.com/sensepost/DET) - Proof of concept to perform data exfiltration using either single or multiple channel(s) at the same time.
-* [Iodine](https://code.kryo.se/iodine/) - Tunnel IPv4 data through a DNS server; useful for exfiltration from networks where Internet access is firewalled, but DNS queries are allowed.
-* [TrevorC2](https://github.com/trustedsec/trevorc2) - Client/server tool for masking command and control and data exfiltration through a normally browsable website, not typical HTTP POST requests.
-* [dnscat2](https://github.com/iagox86/dnscat2) - Tool designed to create an encrypted command and control channel over the DNS protocol, which is an effective tunnel out of almost every network.
-* [pwnat](https://github.com/samyk/pwnat) - Punches holes in firewalls and NATs.
-* [tgcd](http://tgcd.sourceforge.net/) - Simple Unix network utility to extend the accessibility of TCP/IP based network services beyond firewalls.
-
 ### Network Reconnaissance Tools
 
 * [ACLight](https://github.com/cyberark/ACLight) - Script for advanced discovery of sensitive Privileged Accounts - includes Shadow Admins.
@@ -412,6 +438,8 @@ See also [awesome-industrial-control-system-security](https://github.com/hslatma
 
 ### Protocol Analyzers and Sniffers
 
+See also [awesome-pcaptools](https://github.com/caesar0301/awesome-pcaptools).
+
 * [Debookee](http://www.iwaxx.com/debookee/) - Simple and powerful network traffic analyzer for macOS.
 * [Dshell](https://github.com/USArmyResearchLab/Dshell) - Network forensic analysis framework.
 * [Netzob](https://github.com/netzob/netzob) - Reverse engineering, traffic generation and fuzzing of communication protocols.
@@ -595,7 +623,7 @@ See also [awesome-industrial-control-system-security](https://github.com/hslatma
 * [Penetration Testing Framework (PTF)](http://www.vulnerabilityassessment.co.uk/Penetration%20Test.html) - Outline for performing penetration tests compiled as a general framework usable by vulnerability analysts and penetration testers alike.
 * [XSS-Payloads](http://www.xss-payloads.com) - Resource dedicated to all things XSS (cross-site), including payloads, tools, games, and documentation.
 
-### Social Engineering Resources
+### Online Social Engineering Resources
 
 * [Social Engineering Framework](http://www.social-engineer.org/framework/general-discussion/) - Information resource for social engineers.
 
@@ -610,7 +638,7 @@ See also [awesome-industrial-control-system-security](https://github.com/hslatma
 * [Awesome Lockpicking](https://github.com/meitar/awesome-lockpicking) - Awesome guides, tools, and other resources about the security and compromise of locks, safes, and keys.
 * [Awesome Shodan Queries](https://github.com/jakejarvis/awesome-shodan-queries) - Awesome list of useful, funny, and depressing search queries for Shodan.
 * [AWS Tool Arsenal](https://github.com/toniblyx/my-arsenal-of-aws-security-tools) - List of tools for testing and securing AWS environments.
-* [Blue Team](https://github.com/meitar/awesome-cybersecurity-blueteam) - Awesome resources, tools, and other shiny things for cybersecurity blue teams.
+* [Blue Team](https://github.com/fabacab/awesome-cybersecurity-blueteam) - Awesome resources, tools, and other shiny things for cybersecurity blue teams.
 * [C/C++ Programming](https://github.com/fffaraz/awesome-cpp) - One of the main language for open source security tools.
 * [CTFs](https://github.com/apsdehal/awesome-ctf) - Capture The Flag frameworks, libraries, etc.
 * [Forensics](https://github.com/Cugu/awesome-forensics) - Free (mostly open source) forensic analysis tools and resources.
@@ -624,7 +652,6 @@ See also [awesome-industrial-control-system-security](https://github.com/hslatma
 * [Malware Analysis](https://github.com/rshipp/awesome-malware-analysis) - Tools and resources for analysts.
 * [Node.js Programming by @sindresorhus](https://github.com/sindresorhus/awesome-nodejs) - Curated list of delightful Node.js packages and resources.
 * [OSINT](https://github.com/jivoi/awesome-osint) - Awesome OSINT list containing great resources.
-* [PCAP Tools](https://github.com/caesar0301/awesome-pcaptools) - Tools for processing network traffic.
 * [Pentest Cheat Sheets](https://github.com/coreb1t/awesome-pentest-cheat-sheets) - Awesome Pentest Cheat Sheets.
 * [Python Programming by @svaksha](https://github.com/svaksha/pythonidae) - General Python programming.
 * [Python Programming by @vinta](https://github.com/vinta/awesome-python) - General Python programming.
@@ -700,7 +727,6 @@ See also [awesome-reversing](https://github.com/tylerha97/awesome-reversing).
 * [binwalk](https://github.com/devttys0/binwalk) - Fast, easy to use tool for analyzing, reverse engineering, and extracting firmware images.
 * [boxxy](https://github.com/kpcyrd/boxxy-rs) - Linkable sandbox explorer.
 * [dnSpy](https://github.com/0xd4d/dnSpy) - Tool to reverse engineer .NET assemblies.
-* [peda](https://github.com/longld/peda) - Python Exploit Development Assistance for GDB.
 * [plasma](https://github.com/joelpx/plasma) - Interactive disassembler for x86/ARM/MIPS. Generates indented pseudo-code with colored syntax code.
 * [pwndbg](https://github.com/pwndbg/pwndbg) - GDB plug-in that eases debugging with GDB, with a focus on features needed by low-level software developers, hardware hackers, reverse-engineers, and exploit developers.
 * [rVMI](https://github.com/fireeye/rVMI) - Debugger on steroids; inspect userspace processes, kernel drivers, and preboot environments in a single tool.
@@ -709,7 +735,6 @@ See also [awesome-reversing](https://github.com/tylerha97/awesome-reversing).
 ## Security Education Courses
 
 * [ARIZONA CYBER WARFARE RANGE](http://azcwr.org/) - 24x7 live fire exercises for beginners through real world operations; capability for upward progression into the real world of cyber warfare.
-* [CTF Field Guide](https://trailofbits.github.io/ctf/) - Everything you need to win your next CTF competition.
 * [Cybrary](http://cybrary.it) - Free courses in ethical hacking and advanced penetration testing. Advanced penetration testing courses are based on the book 'Penetration Testing for Highly Secured Environments'.
 * [European Union Agency for Network and Information Security](https://www.enisa.europa.eu/topics/trainings-for-cybersecurity-specialists/online-training-material) - ENISA Cyber Security Training material.
 * [Offensive Security Training](https://www.offensive-security.com/information-security-training/) - Training from BackTrack/Kali developers.
@@ -749,6 +774,11 @@ See also [awesome-reversing](https://github.com/tylerha97/awesome-reversing).
 * [sobelow](https://github.com/nccgroup/sobelow) - Security-focused static analysis for the Phoenix Framework.
 * [cwe_checker](https://github.com/fkie-cad/cwe_checker) - Suite of tools built atop the Binary Analysis Platform (BAP) to heuristically detect CWEs in compiled binaries and firmware.
 
+## Steganography Tools
+
+* [Cloakify](https://github.com/TryCatchHCF/Cloakify) - Textual steganography toolkit that converts any filetype into lists of everyday strings.
+* [StegCracker](https://github.com/Paradoxis/StegCracker) - Steganography brute-force utility to uncover hidden data inside files.
+
 ## Vulnerability Databases
 
 * [Bugtraq (BID)](http://www.securityfocus.com/bid/) - Software security bug identification database compiled from submissions to the SecurityFocus mailing list and other sources, operated by Symantec, Inc.
@@ -796,7 +826,6 @@ See also [awesome-reversing](https://github.com/tylerha97/awesome-reversing).
 * [Wappalyzer](https://www.wappalyzer.com/) - Wappalyzer uncovers the technologies used on websites.
 * [WhatWaf](https://github.com/Ekultek/WhatWaf) - Detect and bypass web application firewalls and protection systems.
 * [WhatWeb](https://github.com/urbanadventurer/WhatWeb) - Website fingerprinter.
-* [Wordpress Exploit Framework](https://github.com/rastating/wordpress-exploit-framework) - Ruby framework for developing and using modules which aid in the penetration testing of WordPress powered websites and systems.
 * [autochrome](https://www.nccgroup.trust/us/about-us/newsroom-and-events/blog/2017/march/autochrome/) - Easy to install a test browser with all the appropriate setting needed for web application testing with native Burp support, from NCCGroup.
 * [badtouch](https://github.com/kpcyrd/badtouch) - Scriptable network authentication cracker.
 * [fimap](https://github.com/kurobeats/fimap) - Find, prepare, audit, exploit and even Google automatically for LFI/RFI bugs.
@@ -809,12 +838,6 @@ See also [awesome-reversing](https://github.com/tylerha97/awesome-reversing).
 * [webscreenshot](https://github.com/maaaaz/webscreenshot) - Simple script to take screenshots of websites from a list of sites.
 * [weevely3](https://github.com/epinna/weevely3) - Weaponized PHP-based web shell.
 
-## Android Utilities
-
-* [Android Open Pwn Project (AOPP)](https://www.pwnieexpress.com/aopp) - Variant of the Android Open Source Project (AOSP), called Pwnix, is built from the ground up for network hacking and pentesting.
-* [cSploit](https://www.csploit.org/) - Advanced IT security professional toolkit on Android featuring an integrated Metasploit daemon and MITM capabilities.
-* [Fing](https://www.fing.com/products/fing-app/) - Network scanning and host enumeration app that performs NetBIOS, UPnP, Bonjour, SNMP, and various other advanced device fingerprinting techniques.
-
 ## Windows Utilities
 
 * [Bloodhound](https://github.com/adaptivethreat/Bloodhound/wiki) - Graphical Active Directory trust relationship explorer.
@@ -842,11 +865,6 @@ See also [awesome-reversing](https://github.com/tylerha97/awesome-reversing).
 * [wePWNise](https://labs.mwrinfosecurity.com/tools/wepwnise/) - Generates architecture independent VBA code to be used in Office documents or templates and automates bypassing application control and exploit mitigation software.
 * [WinPwn](https://github.com/SecureThisShit/WinPwn) - Internal penetration test script to perform local and domain reconnaissance, privilege escalation and exploitation.
 
-## macOS Utilities
-
-* [Bella](https://github.com/kdaoudieh/Bella) - Pure Python post-exploitation data mining and remote administration tool for macOS.
-* [EvilOSX](https://github.com/Marten4n6/EvilOSX) - Modular RAT that uses numerous evasion and exfiltration techniques out-of-the-box.
-
 ## License
 
 [![CC-BY](https://mirrors.creativecommons.org/presskit/buttons/88x31/svg/by.svg)](https://creativecommons.org/licenses/by/4.0/)