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 /src/feature/api/tor_api_internal.h | |
| 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 'src/feature/api/tor_api_internal.h')
0 files changed, 0 insertions, 0 deletions