Merge branch 'maint-0.4.2' into maint-0.4.3

diff --cc Makefile.am
index 3b30c01f00bc59e95886928dd7a831f1a39d5bb1,f6346fe0fc085e98c3a19deef0135591b254a0a7..1041494da746e9fb40a01f5095d3a9a49c6e6e4d
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -162,53 -157,40 +162,55 @@@ include src/include.a
  include doc/include.am
  include contrib/include.am
  
+ manpages: $(nodist_man1_MANS)
+ 
  EXTRA_DIST+= \
 -      ChangeLog                                       \
 -      CONTRIBUTING                                    \
 -      CODE_OF_CONDUCT                                 \
 -      INSTALL                                         \
 -      LICENSE                                         \
 -      Makefile.nmake                                  \
 -      README                                          \
 -      ReleaseNotes                                    \
 -      scripts/maint/checkIncludes.py                  \
 -      scripts/maint/checkSpace.pl                     \
 -      scripts/maint/checkShellScripts.sh                      \
 -      scripts/maint/practracker/README                \
 -      scripts/maint/practracker/exceptions.txt        \
 -      scripts/maint/practracker/includes.py           \
 -      scripts/maint/practracker/metrics.py            \
 -      scripts/maint/practracker/practracker.py        \
 -      scripts/maint/practracker/practracker_tests.py  \
 -      scripts/maint/practracker/problem.py            \
 -      scripts/maint/practracker/testdata/.may_include \
 -      scripts/maint/practracker/testdata/a.c          \
 -      scripts/maint/practracker/testdata/b.c          \
 -      scripts/maint/practracker/testdata/ex0-expected.txt \
 -      scripts/maint/practracker/testdata/ex0.txt      \
 -      scripts/maint/practracker/testdata/ex1-expected.txt \
 -      scripts/maint/practracker/testdata/ex1.txt      \
 -      scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 -      scripts/maint/practracker/testdata/ex.txt       \
 -      scripts/maint/practracker/testdata/header.h     \
 -      scripts/maint/practracker/testdata/not_c_file   \
 -      scripts/maint/practracker/test_practracker.sh   \
 -      scripts/maint/practracker/util.py
 +      ChangeLog                                                       \
 +      CONTRIBUTING                                                    \
 +      CODE_OF_CONDUCT                                                 \
 +      INSTALL                                                         \
 +      LICENSE                                                         \
 +      Makefile.nmake                                                  \
 +      README                                                          \
 +      ReleaseNotes                                                    \
 +      scripts/maint/checkIncludes.py                                  \
 +      scripts/maint/checkSpace.pl                                     \
 +      scripts/maint/checkSpaceTest.sh                                 \
 +      scripts/maint/checkspace_tests/dubious.c                        \
 +      scripts/maint/checkspace_tests/dubious.h                        \
 +      scripts/maint/checkspace_tests/expected.txt                     \
 +      scripts/maint/checkspace_tests/good_guard.h                     \
 +      scripts/maint/checkspace_tests/same_guard.h                     \
 +      scripts/maint/checkspace_tests/subdir/dubious.c                 \
 +      scripts/maint/checkShellScripts.sh                              \
 +      scripts/maint/practracker/README                                \
 +      scripts/maint/practracker/exceptions.txt                        \
 +      scripts/maint/practracker/includes.py                           \
 +      scripts/maint/practracker/metrics.py                            \
 +      scripts/maint/practracker/practracker.py                        \
 +      scripts/maint/practracker/practracker_tests.py                  \
 +      scripts/maint/practracker/problem.py                            \
 +      scripts/maint/practracker/testdata/.may_include                 \
 +      scripts/maint/practracker/testdata/a.c                          \
 +      scripts/maint/practracker/testdata/b.c                          \
 +      scripts/maint/practracker/testdata/ex0-expected.txt             \
 +      scripts/maint/practracker/testdata/ex0.txt                      \
 +      scripts/maint/practracker/testdata/ex1-expected.txt             \
 +      scripts/maint/practracker/testdata/ex1.txt                      \
 +      scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 +      scripts/maint/practracker/testdata/ex1-regen-expected.txt       \
 +      scripts/maint/practracker/testdata/ex1-regen-overbroad-expected.txt \
 +      scripts/maint/practracker/testdata/ex.txt                       \
 +      scripts/maint/practracker/testdata/header.h                     \
 +      scripts/maint/practracker/testdata/not_c_file                   \
 +      scripts/maint/practracker/test_practracker.sh                   \
 +      scripts/maint/practracker/util.py                               \
 +      scripts/coccinelle/apply.sh                                     \
 +      scripts/coccinelle/check_cocci_parse.sh                         \
 +      scripts/coccinelle/exceptions.txt                               \
 +      scripts/coccinelle/test-operator-cleanup                        \
 +      scripts/coccinelle/tor-coccinelle.h                             \
 +      scripts/coccinelle/try_parse.sh
  
  ## This tells etags how to find mockable function definitions.
  AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*\([a-zA-Z0-9_]+\)\W*,/\1/s'