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

[asn at torproject.org]

commit b2c2cb928722cd3ecd0781d51ce5c9a7c9029b55
Merge: 4d461e20f 562bcbcfc
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu May 2 18:12:52 2019 +0300

    Merge branch 'tor-github/pr/986'

 changes/ticket26288                      |   6 +
 scripts/maint/practracker/exceptions.txt |  10 +-
 src/core/crypto/relay_crypto.c           |  30 ++
 src/core/crypto/relay_crypto.h           |   3 +
 src/core/include.am                      |   2 +
 src/core/or/circuit_st.h                 |  20 +
 src/core/or/circuitlist.c                |   6 +
 src/core/or/connection_edge.c            |  24 +-
 src/core/or/connection_edge.h            |   1 +
 src/core/or/relay.c                      | 344 +++++++++---------
 src/core/or/relay.h                      |   1 +
 src/core/or/relay_crypto_st.h            |   2 +
 src/core/or/sendme.c                     | 604 +++++++++++++++++++++++++++++++
 src/core/or/sendme.h                     |  68 ++++
 src/test/include.am                      |   1 +
 src/test/test.c                          |   1 +
 src/test/test.h                          |   1 +
 src/test/test_sendme.c                   | 267 ++++++++++++++
 src/trunnel/include.am                   |   3 +
 src/trunnel/sendme.c                     | 347 ++++++++++++++++++
 src/trunnel/sendme.h                     | 101 ++++++
 src/trunnel/sendme.trunnel               |  19 +
 22 files changed, 1676 insertions(+), 185 deletions(-)

diff --cc scripts/maint/practracker/exceptions.txt
index c41b0a0b1,f8bb2bd37..9b4c03a72
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@@ -119,10 -119,10 +119,10 @@@ problem function-size /src/core/or/conn
  problem function-size /src/core/or/connection_or.c:connection_or_compute_authenticate_cell_body() 235
  problem file-size /src/core/or/policies.c 3171
  problem function-size /src/core/or/policies.c:policy_summarize() 107
 -problem function-size /src/core/or/protover.c:protover_all_supported() 116
 +problem function-size /src/core/or/protover.c:protover_all_supported() 117
  problem file-size /src/core/or/relay.c 3173
  problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 123
- problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 101
+ problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 112
  problem function-size /src/core/or/relay.c:connection_ap_process_end_not_open() 194
  problem function-size /src/core/or/relay.c:connection_edge_process_relay_cell_not_open() 139
  problem function-size /src/core/or/relay.c:connection_edge_process_relay_cell() 520