[tor-commits] [tor/master] Merge branch 'ticket30924_042_04_squashed' into ticket30924_042_04_squashed_merged

[nickm at torproject.org]

commit a642a4cbd7016b350b7386096e752e1a73057b54
Merge: 1e7c7870e 622c2c788
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 9 11:10:53 2019 -0400

    Merge branch 'ticket30924_042_04_squashed' into ticket30924_042_04_squashed_merged

 changes/ticket30924                         |   6 +
 doc/tor.1.txt                               |  46 ++-
 scripts/maint/practracker/exceptions.txt    |  26 +-
 src/app/config/config.c                     |   5 +
 src/core/or/or.h                            |   4 +
 src/core/or/or_circuit_st.h                 |   4 +
 src/core/or/protover.c                      |   2 +-
 src/core/or/versions.c                      |   4 +-
 src/feature/hs/hs_cell.c                    | 111 ++++++-
 src/feature/hs/hs_cell.h                    |  11 +
 src/feature/hs/hs_circuit.c                 |   2 +-
 src/feature/hs/hs_config.c                  |  60 ++++
 src/feature/hs/hs_config.h                  |   9 +
 src/feature/hs/hs_dos.c                     |  68 ++--
 src/feature/hs/hs_dos.h                     |  10 +-
 src/feature/hs/hs_intropoint.c              | 190 ++++++++++-
 src/feature/hs/hs_intropoint.h              |   3 +
 src/feature/hs/hs_service.c                 |   7 +
 src/feature/hs/hs_service.h                 |   9 +
 src/feature/nodelist/nodelist.c             |  13 +-
 src/feature/nodelist/nodelist.h             |   1 +
 src/feature/rend/rendmid.c                  |   3 +-
 src/test/test_hs_cell.c                     |  96 +++++-
 src/test/test_hs_config.c                   | 109 +++++++
 src/test/test_hs_dos.c                      |  62 +++-
 src/test/test_hs_intropoint.c               | 161 +++++++++-
 src/trunnel/hs/cell_common.c                | 116 +++----
 src/trunnel/hs/cell_common.h                |  98 +++---
 src/trunnel/hs/cell_common.trunnel          |   4 +-
 src/trunnel/hs/cell_establish_intro.c       | 469 ++++++++++++++++++++++++++++
 src/trunnel/hs/cell_establish_intro.h       | 159 ++++++++++
 src/trunnel/hs/cell_establish_intro.trunnel |  23 ++
 32 files changed, 1703 insertions(+), 188 deletions(-)