about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--TODO.md8
m---------nyx_mode/QEMU-Nyx0
m---------unicorn_mode/unicornafl0
3 files changed, 8 insertions, 0 deletions
diff --git a/TODO.md b/TODO.md
index 9bdb2c55..3f8855a0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -10,7 +10,15 @@
 
 ## Should
 
+<<<<<<< Updated upstream
  - add value_profile but only enable after 15 minutes without finds?
+=======
+ - afl-showmap -f support
+ - afl-fuzz multicore wrapper script
+ - UI revamp
+ - hardened_usercopy=0 page_alloc.shuffle=0
+ - add value_profile but only enable after 15 minutes without finds
+>>>>>>> Stashed changes
  - afl-crash-analysis
  - support persistent and deferred fork server in afl-showmap?
  - better autodetection of shifting runtime timeout values
diff --git a/nyx_mode/QEMU-Nyx b/nyx_mode/QEMU-Nyx
-Subproject 92ed7cefc1bd043a1230ca74b263b484825c265
+Subproject 874fa033d117a3e9931245cb9e82836a4abc042
diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl
-Subproject f607118fc10e5225da751385075792e24133a13
+Subproject f2cede37a75bbd4a9b9438f0277727b5d462057