diff options
| -rw-r--r-- | frida_mode/README.md | 5 | ||||
| m--------- | qemu_mode/qemuafl | 0 |
2 files changed, 5 insertions, 0 deletions
diff --git a/frida_mode/README.md b/frida_mode/README.md index d9634df2..2c6b0316 100644 --- a/frida_mode/README.md +++ b/frida_mode/README.md @@ -53,8 +53,13 @@ instead we use 'O' in hommage to the [author](https://github.com/oleavr) of FRIDA. Similarly, the intention is to mimic the use of environment variables used by +<<<<<<< Updated upstream QEMU where possible (by replacing `s/QEMU/FRIDA/g`). Accordingly, the following options are currently supported: +======= +QEMU where possible (although replacing `s/QEMU/FRIDA/g`). Accordingly, the +following options are currently supported. +>>>>>>> Stashed changes * `AFL_FRIDA_DEBUG_MAPS` - See `AFL_QEMU_DEBUG_MAPS` * `AFL_FRIDA_EXCLUDE_RANGES` - See `AFL_QEMU_EXCLUDE_RANGES` diff --git a/qemu_mode/qemuafl b/qemu_mode/qemuafl -Subproject ddc4a9748d59857753fb33c30a356f354595f36 +Subproject d73b0336b451fd034e5f469089fb7ee96c80adf |