torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ticket33029_042_01' into ticket33029_043_03

Browse Source 
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>
This commit is contained in:
David Goulet
2020-02-11 10:30:29 -05:00
parent de31c4757b 7b4d9fabef
commit f0964628e6
15 changed files with 371 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/tor.1.txt
+9 -1
View File
@@ -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.