[tor-commits] [tor/master] Merge remote-tracking branch 'asn-github/adaptive_padding-final'

[nickm@xxxxxxxxxxxxxx]

commit b169c8c14f23394b40305f38ee4ce08add278e27
Merge: 691dec5d4 b269ab5aa
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jan 14 14:48:00 2019 -0500

    Merge remote-tracking branch 'asn-github/adaptive_padding-final'

 doc/tor.1.txt                              |   35 +-
 src/app/config/config.c                    |    6 +
 src/app/config/or_options_st.h             |    3 +
 src/app/main/main.c                        |   10 +-
 src/core/include.am                        |    2 +
 src/core/or/circuit_st.h                   |   26 +
 src/core/or/circuitbuild.c                 |   23 +-
 src/core/or/circuitlist.c                  |    4 +
 src/core/or/circuitpadding.c               | 2562 ++++++++++++++++++++++++++++
 src/core/or/circuitpadding.h               |  696 ++++++++
 src/core/or/circuituse.c                   |   14 +
 src/core/or/connection_edge.c              |    5 +
 src/core/or/or.h                           |    7 +
 src/core/or/origin_circuit_st.h            |    4 +
 src/core/or/protover.c                     |    7 +-
 src/core/or/protover.h                     |    1 +
 src/core/or/relay.c                        |   36 +-
 src/core/or/relay.h                        |    5 +
 src/core/or/versions.c                     |    2 +
 src/feature/hibernate/hibernate.c          |    3 +-
 src/feature/nodelist/networkstatus.c       |    2 +
 src/feature/nodelist/nodelist.c            |    4 +-
 src/feature/nodelist/routerlist.c          |    2 +
 src/lib/crypt_ops/crypto_rand.c            |   11 +
 src/lib/crypt_ops/crypto_rand.h            |    1 +
 src/lib/defs/include.am                    |    1 +
 src/lib/defs/time.h                        |   23 +
 src/lib/math/.may_include                  |    2 +
 src/lib/math/fp.c                          |   25 +
 src/lib/math/fp.h                          |    1 +
 src/lib/math/include.am                    |    6 +-
 src/lib/math/prob_distr.c                  | 1717 +++++++++++++++++++
 src/lib/math/prob_distr.h                  |  158 ++
 src/lib/smartlist_core/smartlist_foreach.h |   13 +
 src/lib/time/.may_include                  |    1 +
 src/lib/time/compat_time.c                 |    4 +-
 src/lib/time/compat_time.h                 |    2 +-
 src/lib/time/tvdiff.c                      |    3 +-
 src/rust/protover/protover.rs              |    8 +-
 src/test/Makefile.nmake                    |    1 +
 src/test/include.am                        |    3 +
 src/test/prob_distr_mpfr_ref.c             |   64 +
 src/test/test.c                            |    2 +
 src/test/test.h                            |    3 +
 src/test/test_circuitpadding.c             | 2356 +++++++++++++++++++++++++
 src/test/test_containers.c                 |   25 +
 src/test/test_prob_distr.c                 | 1428 ++++++++++++++++
 src/test/test_slow.c                       |    1 +
 src/test/test_util.c                       |   25 +-
 src/trunnel/circpad_negotiation.c          |  549 ++++++
 src/trunnel/circpad_negotiation.h          |  195 +++
 src/trunnel/circpad_negotiation.trunnel    |   44 +
 src/trunnel/include.am                     |   11 +-
 53 files changed, 10102 insertions(+), 40 deletions(-)

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