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

[teor@xxxxxxxxxxxxxx]

commit c34fb3413dee5be00be7299a63c294ddb86b0599
Merge: 183f89cca 59ba61a69
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Mon Nov 18 11:21:37 2019 +1000

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

 changes/ticket32415                  |   3 +
 src/app/config/config.c              |   2 +-
 src/app/main/ntmain.c                |   2 +-
 src/core/mainloop/cpuworker.c        |   4 +-
 src/core/mainloop/cpuworker.h        |   4 +-
 src/core/or/cell_queue_st.h          |   2 +-
 src/core/or/channel.c                |  22 ++---
 src/core/or/channel.h                |  12 +--
 src/core/or/channeltls.h             |   2 +-
 src/core/or/circuitmux.c             |   4 +-
 src/core/or/circuitmux.h             |  14 ++--
 src/core/or/circuitmux_ewma.h        |  12 +--
 src/core/or/circuitpadding.c         |  12 +--
 src/core/or/circuitstats.h           |   2 +-
 src/core/or/destroy_cell_queue_st.h  |   2 +-
 src/core/or/or.h                     |  16 ++--
 src/core/or/or_circuit_st.h          |   2 +-
 src/core/or/relay.h                  |   2 +-
 src/core/or/relay_crypto_st.h        |   2 +-
 src/core/or/scheduler.h              |   8 +-
 src/core/or/scheduler_kist.c         |  14 ++--
 src/ext/timeouts/timeout.h           |   6 +-
 src/feature/client/entrynodes.h      |   4 +-
 src/feature/control/control_events.c |   6 +-
 src/feature/dirauth/bwauth.c         |   2 +-
 src/feature/dirauth/dircollate.c     |   8 +-
 src/feature/dirauth/dircollate.h     |   8 +-
 src/feature/dircache/conscache.c     |   2 +-
 src/feature/dircache/conscache.h     |   4 +-
 src/feature/dircache/consdiffmgr.c   |   2 +-
 src/feature/dircache/consdiffmgr.h   |   4 +-
 src/feature/dircache/dircache.c      |   2 +-
 src/feature/dircommon/fp_pair.c      |  12 +--
 src/feature/dircommon/fp_pair.h      |   4 +-
 src/lib/cc/compat_compiler.h         |  12 +--
 src/lib/container/handles.h          |  23 +++---
 src/lib/container/map.h              |  59 +++++++-------
 src/lib/crypt_ops/aes.h              |   2 +-
 src/lib/crypt_ops/aes_openssl.c      |   2 +-
 src/lib/crypt_ops/crypto_cipher.h    |   2 +-
 src/lib/crypt_ops/crypto_ope.h       |   6 +-
 src/lib/crypt_ops/crypto_rand_fast.c |  10 +--
 src/lib/evloop/compat_libevent.c     |   2 +-
 src/lib/evloop/compat_libevent.h     |   6 +-
 src/lib/evloop/timers.c              |   4 +-
 src/lib/evloop/workqueue.c           |  20 ++---
 src/lib/evloop/workqueue.h           |   6 +-
 src/lib/fs/storagedir.h              |   4 +-
 src/lib/math/prob_distr.c            | 152 ++++++++++++++++++-----------------
 src/lib/math/prob_distr.h            | 100 +++++++++++------------
 src/lib/sandbox/sandbox.h            |  10 +--
 src/lib/thread/threads.h             |   2 +-
 src/test/test-timers.c               |   2 +-
 src/test/test_consdiffmgr.c          |   4 +-
 src/test/test_dispatch.c             |   6 +-
 src/test/test_link_handshake.c       |   6 +-
 src/test/test_prob_distr.c           |  30 +++----
 src/test/test_threads.c              |   2 +-
 src/test/test_workqueue.c            |   8 +-
 src/test/testing_common.c            |   2 +-
 60 files changed, 349 insertions(+), 340 deletions(-)

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