diff options
author | David Goulet <dgoulet@torproject.org> | 2020-02-11 10:30:29 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2020-02-11 10:30:29 -0500 |
commit | f0964628e6e6b4f5dda6df30fbb19f74c59eccfd (patch) | |
tree | bef864683086a26c0acd46c210a9532f2ee26ad4 /scripts/maint | |
parent | de31c4757b6a58a3b5255298918c6d28e100b506 (diff) | |
parent | 7b4d9fabefa97e1121482ace6bc712cd2b00ff0f (diff) | |
download | tor-f0964628e6e6b4f5dda6df30fbb19f74c59eccfd.tar.gz tor-f0964628e6e6b4f5dda6df30fbb19f74c59eccfd.zip |
Merge branch 'ticket33029_042_01' into ticket33029_043_03
Conflicts:
doc/tor.1.txt
src/app/config/config.c
src/app/config/or_options_st.h
src/core/mainloop/connection.h
Between 042 and 043, the dirauth options were modularized so this merge commit
address this by moving the AuthDirRejectUncompressedRequests to the module
along with a series of accessors.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'scripts/maint')
-rw-r--r-- | scripts/maint/practracker/exceptions.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 70e6a55199..d89b80c1b3 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -73,7 +73,7 @@ problem function-size /src/core/mainloop/connection.c:connection_handle_read_imp problem function-size /src/core/mainloop/connection.c:connection_buf_read_from_socket() 180 problem function-size /src/core/mainloop/connection.c:connection_handle_write_impl() 241 problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 143 -problem dependency-violation /src/core/mainloop/connection.c 44 +problem dependency-violation /src/core/mainloop/connection.c 47 problem dependency-violation /src/core/mainloop/cpuworker.c 12 problem include-count /src/core/mainloop/mainloop.c 64 problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108 |