aboutsummaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-03-13 16:42:47 -0400
committerNick Mathewson <nickm@torproject.org>2020-03-13 16:42:47 -0400
commitb504942331dabe1beb1ddb24a3aea75a565573e2 (patch)
tree125b90001609eaad4ffb44c649f6061d1a405f81 /src/app
parentf021389e92753e1c6bd76c1525e276e174bd897c (diff)
parent7b4d9fabefa97e1121482ace6bc712cd2b00ff0f (diff)
downloadtor-b504942331dabe1beb1ddb24a3aea75a565573e2.tar.gz
tor-b504942331dabe1beb1ddb24a3aea75a565573e2.zip
Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/config.c1
-rw-r--r--src/app/config/or_options_st.h7
2 files changed, 8 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 23781b1b0e..8c635ab848 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -671,6 +671,7 @@ static const config_var_t option_vars_[] = {
OBSOLETE("UseNTorHandshake"),
V(User, STRING, NULL),
OBSOLETE("UserspaceIOCPBuffers"),
+ V(AuthDirRejectRequestsUnderLoad, BOOL, "1"),
V(AuthDirSharedRandomness, BOOL, "1"),
V(AuthDirTestEd25519LinkKeys, BOOL, "1"),
OBSOLETE("V1AuthoritativeDirectory"),
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 32dcd9fb18..e6be797017 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -1008,6 +1008,13 @@ struct or_options_t {
*/
uint64_t MaxUnparseableDescSizeToLog;
+ /** Bool (default: 1): Under bandwidth pressure, if set to 1, the authority
+ * will always answer directory requests from relays but will start sending
+ * 503 error code for the other connections. If set to 0, all connections
+ * are considered the same and the authority will try to answer them all
+ * regardless of bandwidth pressure or not. */
+ int AuthDirRejectRequestsUnderLoad;
+
/** Bool (default: 1): Switch for the shared random protocol. Only
* relevant to a directory authority. If off, the authority won't
* participate in the protocol. If on (default), a flag is added to the