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

[asn at torproject.org]

commit 1797d0516597c4554f19154870fd7455c9884fcf
Merge: 1e230bd48 963c3591c
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Jun 10 15:37:59 2020 +0300

    Merge branch 'tor-github/pr/1925'

 changes/bug30992                        |   4 ++
 src/core/or/circuit_st.h                |   6 ++
 src/core/or/circuitpadding.c            | 113 ++++++++++++++++++++++++--------
 src/core/or/circuitpadding.h            |  13 +++-
 src/test/test_circuitpadding.c          |   8 +--
 src/trunnel/circpad_negotiation.c       |  52 +++++++++++++++
 src/trunnel/circpad_negotiation.h       |  27 ++++++++
 src/trunnel/circpad_negotiation.trunnel |  17 +++++
 8 files changed, 206 insertions(+), 34 deletions(-)