about summary refs log tree commit diff
path: root/docs/PATCHES
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2019-07-14 20:02:20 +0200
committerGitHub <noreply@github.com>2019-07-14 20:02:20 +0200
commitda8e03e18a1d01cb4ea26fc8efb25c4e7708a0b5 (patch)
tree21e2f2e0bbe93341c3813d96576c5e83f62195d0 /docs/PATCHES
parent5c0830f62857bc00d1da386e3d204932f544a6ba (diff)
parent4a80dbdd10aedd3a3e70a0631aeb4e01438b634c (diff)
downloadafl++-da8e03e18a1d01cb4ea26fc8efb25c4e7708a0b5.tar.gz
Merge branch 'master' into shared_memory_mmap_refactor
Diffstat (limited to 'docs/PATCHES')
-rw-r--r--docs/PATCHES6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/PATCHES b/docs/PATCHES
index f61f8d24..f6ca9284 100644
--- a/docs/PATCHES
+++ b/docs/PATCHES
@@ -17,10 +17,12 @@ afl-qemu-optimize-entrypoint.diff	by mh(at)mh-sec(dot)de
 afl-qemu-speed.diff			by abiondo on github
 afl-qemu-optimize-map.diff		by mh(at)mh-sec(dot)de
 
++ instrim (https://github.com/csienslab/instrim) was integrated
++ MOpt (github.com/puppet-meteor/MOpt-AFL) was imported
 + AFLfast additions (github.com/mboehme/aflfast) were incorporated.
 + Qemu 3.1 upgrade with enhancement patches (github.com/andreafioraldi/afl)
-+ Python mutator modules support (github.com/choeller/afl)
-+ Whitelisting in LLVM mode (github.com/choeller/afl)
++ Python mutator modules support (github.com/choller/afl)
++ Whitelisting in LLVM mode (github.com/choller/afl)
 + forkserver patch for afl-tmin (github.com/nccgroup/TriforceAFL)