commit ecb43ce21caccbdfe99b0e12cdce7f83d59b06e3 Merge: 0c91c6359 eb427f309 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 13 10:45:04 2020 -0400

Merge branch 'maint-0.4.4'

changes/ticket31812 | 4 ++++ contrib/clang/sanitize_blacklist.txt | 4 ++-- contrib/operator-tools/tor-exit-notice.html | 4 ++-- doc/HACKING/CodingStandards.md | 2 +- doc/HACKING/CodingStandardsRust.md | 4 ++-- doc/HACKING/Fuzzing.md | 4 ++-- doc/HACKING/GettingStarted.md | 2 +- doc/HACKING/GettingStartedRust.md | 2 +- doc/building-tor-msvc.txt | 8 ++++---- doc/contrib/tor-rpm-creation.txt | 2 +- doc/tor-gencert.1.txt | 2 +- doc/tor-print-ed-signing-cert.1.txt | 2 +- doc/tor-resolve.1.txt | 2 +- doc/tor.1.txt | 2 +- doc/torify.1.txt | 2 +- m4/ax_check_sign.m4 | 2 +- m4/pkg.m4 | 2 +- src/app/config/config.c | 2 +- src/app/main/ntmain.c | 2 +- src/config/mmdb-convert.py | 2 +- src/core/or/circuitstats.c | 12 ++++++------ src/core/or/scheduler.c | 2 +- src/lib/evloop/timers.c | 2 +- src/lib/math/laplace.c | 2 +- src/lib/process/restrict.c | 6 +++--- src/test/slow_ed25519.py | 2 +- src/test/test_crypto_slow.c | 2 +- src/test/test_options.c | 4 ++-- src/test/test_prob_distr.c | 2 +- src/test/test_util.c | 2 +- 30 files changed, 48 insertions(+), 44 deletions(-)

diff --cc doc/HACKING/Fuzzing.md index d140844be,487716bb6..d9e133008 --- a/doc/HACKING/Fuzzing.md +++ b/doc/HACKING/Fuzzing.md @@@ -77,15 -72,13 +77,15 @@@ and then not actually use it

Read afl/docs/notes_for_asan.txt for more details.

- Download recidivm from http://jwilk.net/software/recidivm + Download recidivm from https://jwilk.net/software/recidivm Download the signature Check the signature - tar xvzf recidivm*.tar.gz - cd recidivm* - make - /path/to/recidivm -v src/test/fuzz/fuzz-http + ```console + $ tar xvzf recidivm*.tar.gz + $ cd recidivm* + $ make + $ /path/to/recidivm -v src/test/fuzz/fuzz-http + ``` Use the final "ok" figure as the input to -m when calling afl-fuzz (Normally, recidivm would output a figure automatically, but in some cases, the fuzzing harness will hang when the memory limit is too small.)