about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrea Fioraldi <andreafioraldi@gmail.com>2021-07-19 11:55:14 +0200
committerAndrea Fioraldi <andreafioraldi@gmail.com>2021-07-19 11:55:14 +0200
commitb3fe3b8877931f7ba7c4150fcc24e8cd18835d86 (patch)
tree72ea2ec23931babaee4bd8e7079f7c7bdb5d854b
parentf5e9fe17f20d95d67eda236b208bf1bffa943899 (diff)
parent0daffb6283de80511c0cca416817725bd1a201e0 (diff)
downloadafl++-b3fe3b8877931f7ba7c4150fcc24e8cd18835d86.tar.gz
Merge branch 'dev' of github.com:AFLplusplus/AFLplusplus into dev
-rw-r--r--README.md2
-rw-r--r--docs/Changelog.md4
-rw-r--r--include/config.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/README.md b/README.md
index 94a38ab1..8fcc31ff 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ binary-only fuzzing. It is slower than Qemu mode but works on MacOS, Android,
 iOS etc.
 
 With afl++ 3.15 we introduced the following changes from previous behaviours:
-  * Also -M main mode does not due deterministic fuzzing by default anymore
+  * Also -M main mode does not do deterministic fuzzing by default anymore
   * afl-cmin and afl-showmap -Ci now descent into subdirectories like
     afl-fuzz -i does (but note that afl-cmin.bash does not)
 
diff --git a/docs/Changelog.md b/docs/Changelog.md
index fcfd2ce8..3f3dc642 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -8,6 +8,10 @@
 Want to stay in the loop on major new features? Join our mailing list by
 sending a mail to <afl-users+subscribe@googlegroups.com>.
 
+### Version ++3.15a (dev)
+  - ...
+
+
 ### Version ++3.14c (release)
   - afl-fuzz:
     - fix -F when a '/' was part of the parameter
diff --git a/include/config.h b/include/config.h
index 9d732e53..da74989e 100644
--- a/include/config.h
+++ b/include/config.h
@@ -26,7 +26,7 @@
 /* Version string: */
 
 // c = release, a = volatile github dev, e = experimental branch
-#define VERSION "++3.14a"
+#define VERSION "++3.15a"
 
 /******************************************************
  *                                                    *