diff --git a/changes/fast_bw_param b/changes/fast_bw_param
new file mode 100644
index 0000000000..abe630d8bc
--- /dev/null
+++ b/changes/fast_bw_param
@@ -0,0 +1,8 @@
+ o Minor features (directory authority):
+ - Provide two consensus parameters (FastFlagMinThreshold and
+ FastFlagMaxThreshold) to control the range of allowable bandwidths for
+ the Fast directory flag. This allows authorities to run better
+ experiments on appropriate requirements for being a "Fast" node.
+ The AuthDirFastGuarantee flag still applies.
+
+
diff --git a/src/or/control.c b/src/or/control.c
index a93994606d..60c62b15a5 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3482,7 +3482,6 @@ control_event_circuit_cannibalized(origin_circuit_t *circ,
old_tv_created);
}
-
/** Given an AP connection conn and a len-character buffer
* buf, determine the address:port combination requested on
* conn, and write it to buf. Return 0 on success, -1 on
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 94a415fe21..e5995697dd 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1938,6 +1938,18 @@ dirserv_compute_performance_thresholds(routerlist_t *rl)
if (guard_tk > TIME_KNOWN_TO_GUARANTEE_FAMILIAR)
guard_tk = TIME_KNOWN_TO_GUARANTEE_FAMILIAR;
+ {
+ /* We can vote on a parameter for the minimum and maximum. */
+ int32_t min_fast, max_fast;
+ min_fast = networkstatus_get_param(NULL, "FastFlagMinThreshold",
+ 0, 0, INT32_MAX);
+ max_fast = networkstatus_get_param(NULL, "FastFlagMaxThreshold",
+ INT32_MAX, min_fast, INT32_MAX);
+ if (fast_bandwidth < (uint32_t)min_fast)
+ fast_bandwidth = min_fast;
+ if (fast_bandwidth > (uint32_t)max_fast)
+ fast_bandwidth = max_fast;
+ }
/* Protect sufficiently fast nodes from being pushed out of the set
* of Fast nodes. */
if (options->AuthDirFastGuarantee &&