commit 576e248bc23c2dee24e92569c84ff06a8b53b13e Merge: 90add50550 a634f6b64c Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 8 10:44:58 2021 -0500
Merge remote-tracking branch 'tor-gitlab/mr/278'
changes/ticket40261 | 4 +++ src/app/config/config.c | 13 --------- src/app/config/or_options_st.h | 29 -------------------- src/app/main/subsystem_list.c | 2 ++ src/core/or/dos.c | 42 +++++++++++++++-------------- src/core/or/dos.h | 2 ++ src/core/or/dos_config.c | 29 ++++++++++++++++++++ src/core/or/dos_config.h | 16 +++++++++++ src/core/or/dos_options.inc | 47 +++++++++++++++++++++++++++++++++ src/core/or/dos_options_st.h | 20 ++++++++++++++ src/core/or/dos_sys.c | 60 ++++++++++++++++++++++++++++++++++++++++++ src/core/or/dos_sys.h | 25 ++++++++++++++++++ src/core/or/include.am | 6 +++++ 13 files changed, 233 insertions(+), 62 deletions(-)