Merge branch 'master' of https://github.com/vanhauser-thc/AFLplusplus

4 files changed, 15 insertions, 17 deletions

diff --git a/docs/ChangeLog b/docs/ChangeLog
index e1d66767..3d93821f 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -14,7 +14,15 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
 
 
 -----------------------------
-Version ++2.52c (2019-05-28):
+Version ++2.52d (tbd):
+-----------------------------
+
+  - ... your idea or patch?
+
+
+
+-----------------------------
+Version ++2.52c (2019-06-05):
 -----------------------------
 
   - Applied community patches. See docs/PATCHES for the full list.
diff --git a/docs/README b/docs/README
index e2ddf1ef..d1b05b5a 100644
--- a/docs/README
+++ b/docs/README
@@ -28,7 +28,7 @@ american fuzzy lop plus plus
   Released under terms and conditions of Apache License, Version 2.0.
 
   For new versions and additional information, check out:
-  http://lcamtuf.coredump.cx/afl/
+  https://github.com/vanhauser-thc/AFLplusplus
 
   To compare notes with other users or get notified about major new features,
   send a mail to <afl-users+subscribe@googlegroups.com>.
@@ -513,21 +513,11 @@ Thank you!
 15) Contact
 -----------
 
-Questions? Concerns? Bug reports? The author can be usually reached at
-<lcamtuf@google.com>.
+Questions? Concerns? Bug reports? The contributors can be reached via
+https://github.com/vanhauser-thc/AFLplusplus
 
-There is also a mailing list for the project; to join, send a mail to
+There is also a mailing list for the afl project; to join, send a mail to
 <afl-users+subscribe@googlegroups.com>. Or, if you prefer to browse
 archives first, try:
 
   https://groups.google.com/group/afl-users
-
-PS. If you wish to submit raw code to be incorporated into the project, please
-be aware that the copyright on most of AFL is claimed by Google. While you do
-retain copyright on your contributions, they do ask people to agree to a simple
-CLA first:
-
-  https://cla.developers.google.com/clas
-
-Sorry about the hassle. Of course, no CLA is required for feature requests or
-bug reports.
diff --git a/docs/perf_tips.txt b/docs/perf_tips.txt
index 287284fc..263065c0 100644
--- a/docs/perf_tips.txt
+++ b/docs/perf_tips.txt
@@ -191,7 +191,7 @@ There are several OS-level factors that may affect fuzzing speed:
   - Use the afl-system-config script to set all proc/sys settings above
 
   - Disable all the spectre, meltdown etc. security countermeasures in the
-    kernel if your machine is properly seperated:
+    kernel if your machine is properly separated:
     "ibpb=off ibrs=off kpti=off l1tf=off mds=off mitigations=off
      no_stf_barrier noibpb noibrs nopcid nopti nospec_store_bypass_disable
      nospectre_v1 nospectre_v2 pcid=off pti=off spec_store_bypass_disable=off
diff --git a/docs/power_schedules.txt b/docs/power_schedules.txt
index 578ff020..cb4ca6e7 100644
--- a/docs/power_schedules.txt
+++ b/docs/power_schedules.txt
@@ -27,7 +27,7 @@ where *α(i)* is the performance score that AFL uses to compute for the seed inp
   
 More details can be found in our paper that was recently accepted at the [23rd ACM Conference on Computer and Communications Security (CCS'16)](https://www.sigsac.org/ccs/CCS2016/accepted-papers/).
 
-PS: In parallel mode (several instances with shared queue), we suggest to run the master using the exploit schedule (-p exploit) and the slaves with a combination of cut-off-exponential (-p coe), exponential (-p fast; default), and explore (-p explore) schedules. In single mode, the default settings will do. **EDIT:** In parallel mode, AFLFast seems to perform poorly because the path probability estimates are incorrect for the imported seeds. Pull requests to fix this issue by syncing the estimates accross instances are appreciated :)
+PS: In parallel mode (several instances with shared queue), we suggest to run the master using the exploit schedule (-p exploit) and the slaves with a combination of cut-off-exponential (-p coe), exponential (-p fast; default), and explore (-p explore) schedules. In single mode, the default settings will do. **EDIT:** In parallel mode, AFLFast seems to perform poorly because the path probability estimates are incorrect for the imported seeds. Pull requests to fix this issue by syncing the estimates across instances are appreciated :)
 
 Copyright 2013, 2014, 2015, 2016 Google Inc. All rights reserved.
 Released under terms and conditions of Apache License, Version 2.0.