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

[asn at torproject.org]

commit e5ad6fb09298eff0bf8ebf0c3729602b91c3d9df
Merge: 646f7a9a9 c1359b32a
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Jun 11 14:11:24 2019 +0300

    Merge branch 'ticket30769_041_01'

 changes/ticket30769                                 | 4 ++++
 src/core/or/sendme.c                                | 2 +-
 src/ext/trunnel/trunnel-impl.h                      | 2 +-
 src/ext/trunnel/trunnel.c                           | 2 +-
 src/ext/trunnel/trunnel.h                           | 2 +-
 src/trunnel/channelpadding_negotiation.c            | 2 +-
 src/trunnel/channelpadding_negotiation.h            | 2 +-
 src/trunnel/circpad_negotiation.c                   | 2 +-
 src/trunnel/circpad_negotiation.h                   | 2 +-
 src/trunnel/ed25519_cert.c                          | 2 +-
 src/trunnel/ed25519_cert.h                          | 2 +-
 src/trunnel/hs/cell_common.c                        | 2 +-
 src/trunnel/hs/cell_common.h                        | 2 +-
 src/trunnel/hs/cell_establish_intro.c               | 2 +-
 src/trunnel/hs/cell_establish_intro.h               | 2 +-
 src/trunnel/hs/cell_introduce1.c                    | 2 +-
 src/trunnel/hs/cell_introduce1.h                    | 2 +-
 src/trunnel/hs/cell_rendezvous.c                    | 2 +-
 src/trunnel/hs/cell_rendezvous.h                    | 2 +-
 src/trunnel/include.am                              | 6 +++---
 src/trunnel/link_handshake.c                        | 2 +-
 src/trunnel/link_handshake.h                        | 2 +-
 src/trunnel/netinfo.c                               | 2 +-
 src/trunnel/netinfo.h                               | 2 +-
 src/trunnel/pwbox.c                                 | 2 +-
 src/trunnel/pwbox.h                                 | 2 +-
 src/trunnel/{sendme.c => sendme_cell.c}             | 8 ++++----
 src/trunnel/{sendme.h => sendme_cell.h}             | 6 +++---
 src/trunnel/{sendme.trunnel => sendme_cell.trunnel} | 0
 src/trunnel/socks5.c                                | 2 +-
 src/trunnel/socks5.h                                | 2 +-
 31 files changed, 40 insertions(+), 36 deletions(-)