[tor-commits] [tor/master] Merge branch 'tor-github/pr/1000'

[dgoulet at torproject.org]

commit 3885e7b44b1df421aa062ba2598f1731e4e3e3a5
Merge: b72f5da03 e9769d621
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed May 8 08:02:28 2019 -0400

    Merge branch 'tor-github/pr/1000'
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>

 changes/bug30236                         |   3 +
 scripts/maint/practracker/exceptions.txt |  10 +-
 src/core/crypto/relay_crypto.c           |  15 +-
 src/core/crypto/relay_crypto.h           |   5 +
 src/core/include.am                      |   2 +
 src/core/mainloop/connection.c           |   3 +-
 src/core/or/circuitbuild.c               | 122 +-------------
 src/core/or/circuitbuild.h               |   9 --
 src/core/or/circuitlist.c                |  81 +---------
 src/core/or/circuitlist.h                |   1 -
 src/core/or/crypt_path.c                 | 262 +++++++++++++++++++++++++++++++
 src/core/or/crypt_path.h                 |  43 +++++
 src/core/or/crypt_path_st.h              |  23 ++-
 src/core/or/sendme.c                     |  12 +-
 src/core/or/sendme.h                     |   1 -
 src/feature/hs/hs_circuit.c              |   7 +-
 src/feature/rend/rendservice.c           |   5 +-
 src/test/test_circuitpadding.c           |  10 +-
 src/test/test_circuitstats.c             |  16 +-
 src/test/test_hs_client.c                |  22 ++-
 src/test/test_hs_service.c               |  12 +-
 src/test/test_relaycrypt.c               |  10 +-
 22 files changed, 414 insertions(+), 260 deletions(-)