[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1208'

[nickm at torproject.org]

commit 35cfe2e77679e1df5c3ae4b71112fa252acafdca
Merge: 25c97b18f 2b225aaa7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 7 09:49:49 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1208'

 scripts/maint/practracker/exceptions.txt |   6 +-
 src/app/main/main.c                      |   5 +
 src/core/include.am                      |   2 +
 src/core/or/or_circuit_st.h              |   7 ++
 src/feature/hs/hs_circuitmap.c           |  27 +++++
 src/feature/hs/hs_circuitmap.h           |   2 +
 src/feature/hs/hs_common.c               |   2 +
 src/feature/hs/hs_dos.c                  | 188 +++++++++++++++++++++++++++++++
 src/feature/hs/hs_dos.h                  |  37 ++++++
 src/feature/hs/hs_intropoint.c           |  20 +++-
 src/feature/nodelist/networkstatus.c     |   2 +
 src/feature/rend/rendmid.c               |   9 ++
 src/test/include.am                      |   1 +
 src/test/test.c                          |   1 +
 src/test/test.h                          |   1 +
 src/test/test_hs_dos.c                   | 134 ++++++++++++++++++++++
 src/test/test_hs_intropoint.c            |  48 ++++++--
 17 files changed, 476 insertions(+), 16 deletions(-)