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

[asn at torproject.org]

commit 130eb227acd8a8717dcc5258c4dd5b2adc79930b
Merge: 94914e2a4 fcd51fd49
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon May 27 14:20:51 2019 +0300

    Merge branch 'tor-github/pr/1043'

 changes/ticket26846                      |  6 ++
 scripts/maint/practracker/exceptions.txt |  2 +-
 src/core/or/circuit_st.h                 | 11 ++++
 src/core/or/circuitlist.c                |  1 +
 src/core/or/circuitlist.h                |  2 +-
 src/core/or/relay.c                      | 97 +++++++++++++++++++++++++++++---
 src/core/or/relay.h                      |  4 ++
 src/test/test_sendme.c                   | 79 ++++++++++++++++++++++++++
 8 files changed, 191 insertions(+), 11 deletions(-)