[tor-commits] [tor] branch main updated (447775a5e0 -> 2bb8988629)

[gitolite role]

This is an automated email from the git hooks/post-receive script.

ahf pushed a change to branch main
in repository tor.

    from 447775a5e0 Merge branch 'maint-0.4.7'
     new a9fc6c937c protover: Support Relay=5 for Conflux (prop329)
     new 45432175fe trunnel: Add Conflux related cell definition
     new 8b185b2ac3 Prop#329 Cells: Building and parsing parsing conflux commands
     new 0d14d6b44a Prop#329 Tests: Add tests for conflux cells.
     new eac2bad86b Prop#329 params: Consensus parameter and torrc handling
     new a1794ef687 Prop#329 Headers: Header files for conflux
     new 2bd1eca78c Prop#329 Algs: Conflux multiplexed cell receive handling
     new e0881a669a Prop#329 Algs: Conflux multiplexed cell sending decision algs
     new b999051e44 Prop#329 OOM: Handle freeing conflux queues on OOM
     new cf715a56f1 Prop#329 sendme: Adjust sendme sending and tracking for conflux
     new a4ee0c29ee Prop#329: Add purposes for conflux circuits
     new 21c861bfa3 Refactor stream blocking due to channel cell queues
     new 2f865b4bba Prop#329 streams: Handle stream usage with conflux
     new 336a24754d Prop#329 Pool: Handle linking, unlinking, and relaunching conflux circuit legs.
     new 46e473f43e Prop#329 Pool: Avoid sharing Guards and Middles between circuits.
     new 39c2927d6f Prop#329 Pool: Handle pre-building and using conflux sets.
     new 8d4781e730 Prop#329 Tests: Add tests for the conflux pool
     new 731a50c8c4 Prop#329: Add conflux to build
     new 7c70f713c3 Avoid closing dirty circs with active half-edges
     new 2bb8988629 Fix cases where edge connections can stall.

The 20 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/man/tor.1.txt                       |    6 +
 src/app/config/config.c                 |    1 +
 src/app/config/or_options_st.h          |    4 +
 src/app/main/shutdown.c                 |    2 +
 src/app/main/subsystem_list.c           |    2 +
 src/core/mainloop/connection.c          |   27 +-
 src/core/mainloop/connection.h          |    1 +
 src/core/mainloop/mainloop.c            |   12 +-
 src/core/mainloop/mainloop.h            |    2 +-
 src/core/or/circuit_st.h                |   29 +-
 src/core/or/circuitbuild.c              |   80 +-
 src/core/or/circuitbuild.h              |    9 +-
 src/core/or/circuitlist.c               |   35 +
 src/core/or/circuitlist.h               |    9 +-
 src/core/or/circuitpadding.c            |    7 +-
 src/core/or/circuituse.c                |   75 +-
 src/core/or/circuituse.h                |    7 +
 src/core/or/conflux.c                   | 1008 ++++++++++++++++
 src/core/or/conflux.h                   |   84 ++
 src/core/or/conflux_cell.c              |  355 ++++++
 src/core/or/conflux_cell.h              |   50 +
 src/core/or/conflux_params.c            |  281 +++++
 src/core/or/conflux_params.h            |   29 +
 src/core/or/conflux_pool.c              | 1999 +++++++++++++++++++++++++++++++
 src/core/or/conflux_pool.h              |   46 +
 src/core/or/conflux_st.h                |  157 +++
 src/core/or/conflux_sys.c               |   37 +
 src/core/or/conflux_sys.h               |   23 +
 src/core/or/conflux_util.c              |  393 ++++++
 src/core/or/conflux_util.h              |   59 +
 src/core/or/congestion_control_common.c |   14 +-
 src/core/or/congestion_control_common.h |    2 +-
 src/core/or/congestion_control_flow.c   |   47 +-
 src/core/or/congestion_control_flow.h   |    2 -
 src/core/or/connection_edge.c           |   35 +-
 src/core/or/connection_edge.h           |    1 +
 src/core/or/cpath_build_state_st.h      |    2 +
 src/core/or/edge_connection_st.h        |   13 +-
 src/core/or/include.am                  |   13 +
 src/core/or/or.h                        |   12 +
 src/core/or/or_circuit_st.h             |   12 +-
 src/core/or/origin_circuit_st.h         |   11 +-
 src/core/or/protover.c                  |    4 +
 src/core/or/protover.h                  |    3 +
 src/core/or/relay.c                     |  383 ++++--
 src/core/or/versions.c                  |    7 +
 src/feature/client/circpathbias.c       |   13 +-
 src/feature/client/entrynodes.c         |   42 +-
 src/feature/client/entrynodes.h         |   14 +-
 src/feature/nodelist/networkstatus.c    |    2 +
 src/feature/nodelist/node_select.h      |    2 +
 src/feature/nodelist/nodelist.c         |   11 +-
 src/feature/nodelist/nodelist.h         |    1 +
 src/feature/nodelist/routerlist.c       |    5 +
 src/feature/relay/dns.c                 |    4 +
 src/test/fakecircs.c                    |   10 +-
 src/test/include.am                     |    2 +
 src/test/test.c                         |    2 +
 src/test/test.h                         |    2 +
 src/test/test_conflux_cell.c            |   60 +
 src/test/test_conflux_pool.c            | 1338 +++++++++++++++++++++
 src/trunnel/conflux.c                   | 1158 ++++++++++++++++++
 src/trunnel/conflux.h                   |  422 +++++++
 src/trunnel/conflux.trunnel             |   66 +
 src/trunnel/include.am                  |    9 +-
 65 files changed, 8327 insertions(+), 226 deletions(-)
 create mode 100644 src/core/or/conflux.c
 create mode 100644 src/core/or/conflux.h
 create mode 100644 src/core/or/conflux_cell.c
 create mode 100644 src/core/or/conflux_cell.h
 create mode 100644 src/core/or/conflux_params.c
 create mode 100644 src/core/or/conflux_params.h
 create mode 100644 src/core/or/conflux_pool.c
 create mode 100644 src/core/or/conflux_pool.h
 create mode 100644 src/core/or/conflux_st.h
 create mode 100644 src/core/or/conflux_sys.c
 create mode 100644 src/core/or/conflux_sys.h
 create mode 100644 src/core/or/conflux_util.c
 create mode 100644 src/core/or/conflux_util.h
 create mode 100644 src/test/test_conflux_cell.c
 create mode 100644 src/test/test_conflux_pool.c
 create mode 100644 src/trunnel/conflux.c
 create mode 100644 src/trunnel/conflux.h
 create mode 100644 src/trunnel/conflux.trunnel

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.