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

[nickm at torproject.org]

commit ca4b86f90a73532032a573ebc903155a32d0f36b
Merge: c01507a5f eaff47352
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 5 08:19:02 2018 -0500

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

 .gitignore                           |  2 ++
 Makefile.am                          |  2 ++
 changes/ticket28362                  |  6 ++++
 scripts/maint/checkIncludes.py       | 66 ++++++++++++++++++++++++++++++++++++
 src/app/main/main.c                  |  4 ++-
 src/core/mainloop/connection.c       |  2 +-
 src/core/mainloop/mainloop.c         |  2 +-
 src/core/or/circuitlist.c            |  2 +-
 src/core/or/connection_edge.c        |  2 +-
 src/core/or/connection_or.c          |  2 +-
 src/core/or/or.h                     |  2 +-
 src/core/or/relay.c                  |  2 +-
 src/core/or/scheduler.c              |  2 +-
 src/core/or/scheduler_kist.c         |  2 +-
 src/core/proto/proto_cell.c          |  2 +-
 src/core/proto/proto_control0.c      |  2 +-
 src/core/proto/proto_ext_or.c        |  2 +-
 src/core/proto/proto_http.c          |  2 +-
 src/core/proto/proto_socks.c         |  2 +-
 src/ext/.may_include                 | 10 ++++++
 src/ext/csiphash.c                   | 10 +++---
 src/ext/readpassphrase.c             |  2 +-
 src/ext/timeouts/.may_include        |  6 ++++
 src/ext/timeouts/timeout.c           |  5 ++-
 src/ext/timeouts/timeout.h           |  4 +--
 src/feature/control/control.c        |  2 +-
 src/feature/stats/geoip_stats.c      |  2 +-
 src/include.am                       |  1 +
 src/lib/buf/.may_include             | 10 ++++++
 src/lib/{container => buf}/buffers.c |  2 +-
 src/lib/{container => buf}/buffers.h |  0
 src/lib/buf/include.am               | 17 ++++++++++
 src/lib/compress/.may_include        |  1 +
 src/lib/compress/compress_buf.c      |  2 +-
 src/lib/container/.may_include       |  9 ++---
 src/lib/container/bloomfilt.c        |  2 +-
 src/lib/container/include.am         |  2 --
 src/lib/container/map.c              |  2 +-
 src/lib/container/map.h              |  2 +-
 src/lib/crypt_ops/.may_include       |  4 +--
 src/lib/crypt_ops/crypto_init.c      |  2 +-
 src/lib/crypt_ops/digestset.c        |  2 +-
 src/lib/evloop/.may_include          |  4 +--
 src/lib/evloop/timers.c              |  3 +-
 src/lib/evloop/workqueue.c           |  2 +-
 src/lib/fs/.may_include              |  2 +-
 src/lib/malloc/.may_include          |  2 +-
 src/lib/memarea/.may_include         |  2 +-
 src/lib/memarea/memarea.c            |  3 +-
 src/lib/net/.may_include             |  5 +--
 src/lib/net/address.c                |  2 +-
 src/lib/net/buffers_net.c            |  2 +-
 src/lib/net/resolve.c                | 13 +++++--
 src/lib/net/resolve.h                |  2 +-
 src/lib/process/.may_include         |  2 +-
 src/lib/process/waitpid.c            |  2 +-
 src/lib/sandbox/.may_include         |  7 ++--
 src/lib/sandbox/sandbox.c            | 13 ++-----
 src/lib/smartlist_core/.may_include  |  2 +-
 src/lib/string/.may_include          |  4 +--
 src/lib/string/compat_string.c       |  4 +--
 src/lib/term/.may_include            |  3 +-
 src/lib/term/getpass.c               |  2 +-
 src/lib/tls/.may_include             |  6 ++--
 src/lib/tls/buffers_tls.c            |  2 +-
 src/lib/tls/tortls_openssl.c         |  2 +-
 src/rust/build.rs                    |  3 +-
 src/test/fuzz/fuzz_http.c            |  2 +-
 src/test/fuzz/fuzz_http_connect.c    |  2 +-
 src/test/fuzz/fuzz_socks.c           |  2 +-
 src/test/test.c                      |  2 +-
 src/test/test_buffers.c              |  2 +-
 src/test/test_channelpadding.c       |  2 +-
 src/test/test_channeltls.c           |  2 +-
 src/test/test_extorport.c            |  2 +-
 src/test/test_helpers.c              |  2 +-
 src/test/test_oom.c                  |  2 +-
 src/test/test_proto_http.c           |  2 +-
 src/test/test_proto_misc.c           |  2 +-
 src/test/test_routerlist.c           |  2 +-
 src/test/test_socks.c                |  2 +-
 src/test/test_util.c                 |  2 +-
 82 files changed, 226 insertions(+), 105 deletions(-)