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 /doc/tor.1.txt | |
| 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 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a9b9852b7d..a93842b5ee 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -3067,7 +3067,15 @@ on the public Tor network. before it will treat advertised bandwidths as wholly unreliable. (Default: 500) -== HIDDEN SERVICE OPTIONS +[[AuthDirRejectRequestsUnderLoad]] **AuthDirRejectRequestsUnderLoad** **0**|**1**:: + If set, the directory authority will start rejecting directory requests + from non relay connections by sending a 503 error code if it is under + bandwidth pressure (reaching the configured limit if any). Relays will + always tried to be answered even if this is on. (Default: 1) + + +HIDDEN SERVICE OPTIONS +---------------------- The following options are used to configure a hidden service. Some options apply per service and some apply for the whole tor instance. |