[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1447'

[teor at torproject.org]

commit 20606b8a15483b1709dac48fd44f758e292607b8
Merge: 9586ae178 931a5db2a
Author: teor <teor at torproject.org>
Date:   Thu Oct 24 10:00:47 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1447'

 changes/ticket31705                      |  9 +++++
 scripts/coccinelle/apply.sh              |  9 +++++
 scripts/coccinelle/test-operator-cleanup | 13 +++++++
 scripts/coccinelle/tor-coccinelle.h      | 60 ++++++++++++++++++++++++++++++++
 scripts/coccinelle/try_parse.sh          | 29 +++++++++++++++
 src/app/config/config.c                  | 10 ++++++
 src/core/mainloop/mainloop.c             |  9 ++++-
 src/core/mainloop/periodic.h             |  2 ++
 src/core/or/circuitpadding.c             |  2 ++
 src/core/or/or_periodic.c                |  2 ++
 src/feature/client/proxymode.h           |  2 +-
 src/feature/control/control_cmd.c        |  2 ++
 src/feature/control/control_events.c     |  2 ++
 src/feature/dirauth/dirauth_periodic.c   |  2 ++
 src/feature/dircommon/consdiff.c         |  2 ++
 src/feature/dirparse/authcert_members.h  |  2 +-
 src/feature/hs/hs_service.c              |  2 ++
 src/feature/relay/relay_periodic.c       |  2 ++
 src/feature/relay/router.c               |  2 +-
 src/feature/relay/routermode.h           |  4 +--
 src/lib/buf/buffers.c                    |  2 ++
 src/lib/cc/ctassert.h                    |  2 +-
 src/lib/conf/confmacros.h                |  2 ++
 src/lib/conf/conftesting.h               | 11 +++---
 src/lib/container/namemap_st.h           |  2 ++
 src/lib/container/smartlist.h            |  2 ++
 src/lib/crypt_ops/crypto_openssl_mgt.c   |  6 ++--
 src/lib/dispatch/dispatch_naming.c       |  2 ++
 src/lib/evloop/timers.c                  |  6 ++--
 src/lib/intmath/weakrng.h                |  3 ++
 src/lib/log/log.c                        |  2 +-
 src/lib/log/log.h                        |  4 ++-
 src/lib/log/ratelim.h                    |  2 ++
 src/lib/log/util_bug.h                   |  9 +++--
 src/lib/malloc/map_anon.c                |  4 +--
 src/lib/net/address.c                    |  2 +-
 src/lib/string/parse_int.c               |  5 ++-
 src/lib/thread/threads.h                 |  2 ++
 src/lib/tls/tortls_openssl.c             |  2 ++
 src/lib/version/git_revision.c           |  4 +++
 src/lib/wallclock/timeval.h              |  2 ++
 src/test/hs_test_helpers.c               | 28 +++++++--------
 src/test/test.h                          |  6 ++++
 src/test/test_addr.c                     |  6 ++++
 src/test/test_config.c                   |  2 ++
 src/test/test_confparse.c                |  2 ++
 src/test/test_connection.c               |  2 ++
 src/test/test_controller.c               |  4 +++
 src/test/test_crypto.c                   |  2 ++
 src/test/test_crypto_slow.c              |  2 ++
 src/test/test_dir.c                      |  2 ++
 src/test/test_entrynodes.c               |  2 ++
 src/test/test_link_handshake.c           |  2 ++
 src/test/test_options.c                  |  4 ++-
 src/test/test_router.c                   | 10 +++---
 src/test/test_scheduler.c                | 52 +++++++++++++--------------
 src/test/test_util.c                     |  4 +++
 57 files changed, 303 insertions(+), 70 deletions(-)