Merge branch 'bug21447'

changes/bug21447

@@ -0,0 +1,4 @@
+  o Minor bugfixes (testing):
+    - Rename "make fuzz" to "make test-fuzz-corpora", since it doesn't
+      actually fuzz anything. Fixes bug 21447; bugfix on 0.3.0.3-alpha.
+

doc/HACKING/Fuzzing.md

@@ -6,7 +6,10 @@ Check out fuzzing-corpora, and set TOR_FUZZ_CORPORA to point to the place
 where you checked it out.
 
 To run the fuzzing test cases in a deterministic fashion, use:
-  make fuzz
+      make test-fuzz-corpora
+
+This won't actually fuzz Tor!  It will just run all the fuzz binaries
+on our existing set of testcases for the fuzzer.
 
 
 == Different kinds of fuzzing

src/test/fuzz/include.am

@@ -246,5 +246,5 @@ noinst_LIBRARIES += $(OSS_FUZZ_FUZZERS)
 oss-fuzz-fuzzers:  oss-fuzz-prereqs $(OSS_FUZZ_FUZZERS)
 fuzzers: $(FUZZERS) $(LIBFUZZER_FUZZERS)
 
-fuzz: $(FUZZERS)
+test-fuzz-corpora: $(FUZZERS)
 	$(top_srcdir)/src/test/fuzz_static_testcases.sh