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

[nickm at torproject.org]

commit e6b862e6a8bf690571f192efc66f06ed5cb4696d
Merge: 21b051d1c 0cad83bea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 22 11:48:43 2019 -0400

    Merge branch 'ticket30428_041_02_squashed'

 scripts/maint/practracker/exceptions.txt |   4 +-
 src/core/crypto/relay_crypto.c           |  31 ++--
 src/core/crypto/relay_crypto.h           |   5 +-
 src/core/or/circuit_st.h                 |   9 +-
 src/core/or/crypt_path.c                 |  18 +-
 src/core/or/crypt_path.h                 |   3 +
 src/core/or/relay.c                      |   6 +-
 src/core/or/sendme.c                     | 289 +++++++++++++++++++++----------
 src/core/or/sendme.h                     |  27 ++-
 src/test/test_relaycell.c                |   7 +-
 src/test/test_sendme.c                   |  65 ++++---
 11 files changed, 311 insertions(+), 153 deletions(-)