[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor/master] Merge branch 'log_dependencies'



commit 92d8284a9792267514cbe21f3ce1564f6ad0e10b
Merge: b4e23dba9 1b93b065f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jun 26 11:27:33 2018 -0400

    Merge branch 'log_dependencies'

 .gitignore                                         |   16 +
 Makefile.am                                        |   16 +
 scripts/maint/checkIncludes.py                     |   15 +-
 src/common/.may_include                            |    3 -
 src/common/address.c                               |    6 +-
 src/common/address.h                               |   26 +-
 src/common/address_set.c                           |    3 +-
 src/common/buffers.c                               |    2 +-
 src/common/compat.c                                |  488 +--------
 src/common/compat.h                                |   73 +-
 src/common/compat_libevent.c                       |    2 +-
 src/common/compat_pthreads.c                       |   82 +-
 src/common/compat_threads.c                        |   30 +-
 src/common/compat_threads.h                        |   42 +-
 src/common/compat_time.c                           |   56 +-
 src/common/compat_time.h                           |    5 +-
 src/common/compat_winthreads.c                     |   30 +-
 src/common/confline.c                              |    5 +-
 src/common/confline.h                              |    5 +-
 src/common/container.h                             |  742 -------------
 src/common/include.am                              |    6 -
 src/common/memarea.c                               |    3 +-
 src/common/procmon.h                               |    2 +-
 src/common/sandbox.c                               |    6 +-
 src/common/storagedir.c                            |    5 +-
 src/common/timers.c                                |    2 +-
 src/common/token_bucket.c                          |    4 +-
 src/common/util.c                                  | 1122 +-------------------
 src/common/util.h                                  |  207 +---
 src/common/util_format.c                           |   41 +-
 src/common/util_format.h                           |    2 -
 src/common/util_process.c                          |    2 +-
 src/common/workqueue.c                             |    2 +-
 src/include.am                                     |    9 +
 src/lib/cc/compat_compiler.h                       |   14 +
 src/lib/compress/.may_include                      |    1 +
 src/lib/compress/compress.c                        |    2 +-
 src/lib/compress/compress_lzma.c                   |    2 +-
 src/lib/compress/compress_none.c                   |    2 +-
 src/lib/compress/compress_zlib.c                   |    2 +-
 src/lib/compress/compress_zstd.c                   |    2 +-
 src/lib/container/.may_include                     |   16 +
 src/lib/container/bitarray.h                       |   80 ++
 src/lib/container/bloomfilt.c                      |   49 +
 src/lib/container/bloomfilt.h                      |   58 +
 src/lib/container/include.am                       |   24 +
 src/lib/container/map.c                            |  414 ++++++++
 src/lib/container/map.h                            |  255 +++++
 src/lib/container/order.c                          |   51 +
 src/lib/container/order.h                          |   54 +
 .../container.c => lib/container/smartlist.c}      |  508 +--------
 src/lib/container/smartlist.h                      |  360 +++++++
 src/lib/crypt_ops/.may_include                     |    8 +
 src/lib/crypt_ops/aes.c                            |    2 +-
 src/lib/crypt_ops/crypto.c                         |    5 +-
 src/lib/crypt_ops/crypto_curve25519.c              |    3 +-
 src/lib/crypt_ops/crypto_dh.c                      |    2 +-
 src/lib/crypt_ops/crypto_digest.c                  |    5 +-
 src/lib/crypt_ops/crypto_digest.h                  |   16 +-
 src/lib/crypt_ops/crypto_ed25519.c                 |    2 +-
 src/lib/crypt_ops/crypto_format.c                  |    6 +-
 src/lib/crypt_ops/crypto_openssl_mgt.c             |    2 +-
 src/lib/crypt_ops/crypto_pwbox.c                   |    2 +-
 src/lib/crypt_ops/crypto_rand.c                    |    5 +-
 src/lib/crypt_ops/crypto_rsa.c                     |    2 +-
 src/lib/crypt_ops/crypto_rsa.h                     |    2 +-
 src/lib/crypt_ops/crypto_util.c                    |    2 +-
 src/lib/ctime/.may_include                         |    5 +-
 src/lib/ctime/di_ops.c                             |   17 +-
 src/lib/defs/.may_include                          |    1 +
 src/lib/defs/digest_sizes.h                        |   18 +
 src/lib/defs/include.am                            |    3 +
 src/lib/fdio/.may_include                          |    4 +
 src/lib/fdio/fdio.c                                |  109 ++
 src/lib/fdio/fdio.h                                |   17 +
 src/lib/fdio/include.am                            |   17 +
 src/lib/intmath/.may_include                       |    4 +
 src/lib/intmath/addsub.c                           |   20 +
 src/lib/intmath/addsub.h                           |   13 +
 src/lib/intmath/bits.c                             |   88 ++
 src/lib/intmath/bits.h                             |   16 +
 src/lib/intmath/cmp.h                              |   20 +
 src/lib/intmath/include.am                         |   22 +
 src/lib/intmath/muldiv.c                           |   75 ++
 src/lib/intmath/muldiv.h                           |   22 +
 src/lib/lock/.may_include                          |    5 +
 src/lib/lock/compat_mutex.c                        |   34 +
 src/lib/lock/compat_mutex.h                        |   60 ++
 src/lib/lock/compat_mutex_pthreads.c               |   97 ++
 src/lib/lock/compat_mutex_winthreads.c             |   40 +
 src/lib/lock/include.am                            |   24 +
 src/lib/log/.may_include                           |   15 +
 src/lib/log/include.am                             |   24 +
 src/lib/log/ratelim.c                              |   55 +
 src/lib/log/ratelim.h                              |   48 +
 src/{common/log.c => lib/log/torlog.c}             |   62 +-
 src/{common => lib/log}/torlog.h                   |   10 +-
 src/{common => lib/log}/util_bug.c                 |   37 +-
 src/{common => lib/log}/util_bug.h                 |   11 +-
 src/lib/malloc/.may_include                        |    6 +
 src/lib/malloc/include.am                          |   17 +
 src/lib/malloc/util_malloc.c                       |  230 ++++
 src/lib/malloc/util_malloc.h                       |   92 ++
 src/lib/string/.may_include                        |    9 +
 src/lib/string/compat_ctype.c                      |   67 ++
 src/lib/string/compat_ctype.h                      |   62 ++
 src/lib/string/compat_string.c                     |   14 +
 src/lib/string/compat_string.h                     |   39 +
 src/lib/string/include.am                          |   25 +
 src/lib/string/printf.c                            |  152 +++
 src/lib/string/printf.h                            |   25 +
 src/lib/string/scanf.c                             |  312 ++++++
 src/lib/string/scanf.h                             |   19 +
 src/lib/string/util_string.c                       |  340 ++++++
 src/lib/string/util_string.h                       |   42 +
 src/lib/tls/.may_include                           |    2 +
 src/lib/tls/buffers_tls.c                          |    2 +-
 src/lib/tls/tortls.c                               |    4 +-
 src/lib/trace/.may_include                         |    4 +-
 src/lib/trace/debug.h                              |    2 +-
 src/lib/wallclock/.may_include                     |    6 +
 src/lib/wallclock/approx_time.c                    |   38 +
 src/lib/wallclock/approx_time.h                    |   20 +
 src/lib/wallclock/include.am                       |   21 +
 src/lib/wallclock/tm_cvt.c                         |  195 ++++
 src/lib/wallclock/tm_cvt.h                         |   17 +
 src/lib/wallclock/tor_gettimeofday.c               |   82 ++
 src/lib/wallclock/tor_gettimeofday.h               |   15 +
 src/or/config.c                                    |   20 +-
 src/or/config.h                                    |    4 +-
 src/or/confparse.c                                 |    4 +-
 src/or/consdiff.c                                  |    1 -
 src/or/consdiff.h                                  |    3 +-
 src/or/dirauth/dirvote.c                           |    2 +
 src/or/dirserv.c                                   |    3 +-
 src/or/entrynodes.c                                |    3 +-
 src/or/geoip.c                                     |    3 +-
 src/or/hs_client.c                                 |    1 -
 src/or/hs_descriptor.h                             |    1 -
 src/or/include.am                                  |    4 +-
 src/or/keypin.c                                    |    4 +-
 src/or/microdesc.c                                 |    4 +-
 src/or/onion_ntor.c                                |    2 +-
 src/or/or.h                                        |    5 +-
 src/or/parsecommon.c                               |    4 +-
 src/or/parsecommon.h                               |   13 +-
 src/or/protover.h                                  |   11 +-
 src/or/rephist.c                                   |    4 +-
 src/or/routerlist.c                                |    3 +-
 src/or/routerparse.c                               |    3 +-
 src/or/routerset.c                                 |    3 +-
 src/or/routerset.h                                 |    3 +-
 src/or/torcert.c                                   |    2 +-
 src/rust/build.rs                                  |    8 +
 src/test/bench.c                                   |    3 +-
 src/test/fuzz/fuzz_http.c                          |    2 +-
 src/test/fuzz/fuzz_http_connect.c                  |    2 +-
 src/test/log_test_helpers.c                        |    2 +-
 src/test/test_bridges.c                            |    1 -
 src/test/test_bt_cl.c                              |    2 +-
 src/test/test_circuitlist.c                        |    3 +-
 src/test/test_containers.c                         |    5 +-
 src/test/test_dir_common.c                         |    1 -
 src/test/test_entrynodes.c                         |    3 +-
 src/test/test_guardfraction.c                      |    1 -
 src/test/test_logging.c                            |    7 +-
 src/test/test_routerlist.c                         |    1 -
 src/test/test_status.c                             |    2 +-
 src/test/test_tortls.c                             |    2 +-
 src/test/test_util.c                               |    3 +-
 src/test/test_util_slow.c                          |    2 +-
 src/tools/tor-gencert.c                            |    2 +-
 src/tools/tor-resolve.c                            |    2 +-
 173 files changed, 4500 insertions(+), 3534 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits