diff --git a/changes/bug8408 b/changes/bug8408
new file mode 100644
index 0000000000000000000000000000000000000000..ae9cf172e19d1e07989b0e1c8b14e9b966945558
--- /dev/null
+++ b/changes/bug8408
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Allow TestingTorNetworks to override the 4096-byte minimum for the Fast
+ threshold. Otherwise they can't bootstrap until they've observed more
+ traffic. Fixes bug 8508; bugfix on 0.2.4.10-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 3be90be8703d3a94f03fcc5d0e3fbdc5c4a32e01..5727ec30fcc2465133745ca393e697c3f0c8172a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2019,6 +2019,11 @@ The following options are used for running a testing Tor network.
time. Changing this requires that **TestingTorNetwork** is set. (Default:
10 minutes)
+**TestingMinFastFlagThreshold** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**::
+ Minimum value for the Fast flag. Overrides the ordinary minimum taken
+ from the consensus when TestingTorNetwork is set. (Default: 0.)
+
+
SIGNALS
-------
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index d48449fa8192151e710bca0d47f56ebe48cf8b30..f02597e630eb7740a6b0ef0f2ad00a936af17228 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -2312,3 +2312,4 @@ mark_circuit_unusable_for_new_conns(origin_circuit_t *circ)
circ->unusable_for_new_conns = 1;
}
+
diff --git a/src/or/config.c b/src/or/config.c
index f03f3802fc78e9261cef73464dff5887885d8699..75805d0ce827af65a0bfe43c3227b31e8a93ff25 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -341,6 +341,8 @@ static config_var_t option_vars_[] = {
V(PerConnBWRate, MEMUNIT, "0"),
V(PidFile, STRING, NULL),
V(TestingTorNetwork, BOOL, "0"),
+ V(TestingMinExitFlagThreshold, MEMUNIT, "0"),
+ V(TestingMinFastFlagThreshold, MEMUNIT, "0"),
V(OptimisticData, AUTOBOOL, "auto"),
V(PortForwarding, BOOL, "0"),
V(PortForwardingHelper, FILENAME, "tor-fw-helper"),
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 8e8f79a1716653329d9d7a91fa5c2bb8c4b34a5e..e837e4bed5a769e667ddc81fa9ebda06197b2ca6 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1894,11 +1894,17 @@ router_counts_toward_thresholds(const node_t *node, time_t now,
/* Have measured bw? */
int have_mbw =
dirserv_has_measured_bw(node->ri->cache_info.identity_digest);
+ uint64_t min_bw = ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER;
+ const or_options_t *options = get_options();
+
+ if (options->TestingTorNetwork) {
+ min_bw = (int64_t)options->TestingMinExitFlagThreshold;
+ }
return node->ri && router_is_active(node->ri, node, now) &&
!digestmap_get(omit_as_sybil, node->ri->cache_info.identity_digest) &&
- (dirserv_get_credible_bandwidth(node->ri) >=
- ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER) && (have_mbw || !require_mbw);
+ (dirserv_get_credible_bandwidth(node->ri) >= min_bw) &&
+ (have_mbw || !require_mbw);
}
/** Look through the routerlist, the Mean Time Between Failure history, and
@@ -2005,6 +2011,9 @@ dirserv_compute_performance_thresholds(routerlist_t *rl,
ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG,
ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG,
INT32_MAX);
+ if (options->TestingTorNetwork) {
+ min_fast = (int32_t)options->TestingMinFastFlagThreshold;
+ }
max_fast = networkstatus_get_param(NULL, "FastFlagMaxThreshold",
INT32_MAX, min_fast, INT32_MAX);
if (fast_bandwidth < (uint32_t)min_fast)
diff --git a/src/or/or.h b/src/or/or.h
index 88fd38d9d79206586a9e81a69c54ec8c997ee9e1..4d527108720d54f2b16fbd9386a1c534ff4a77b2 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3912,6 +3912,12 @@ typedef struct {
* of certain configuration options. */
int TestingTorNetwork;
+ /** Minimum value for the Exit flag threshold on testing networks. */
+ uint64_t TestingMinExitFlagThreshold;
+
+ /** Minimum value for the Fast flag threshold on testing networks. */
+ uint64_t TestingMinFastFlagThreshold;
+
/** If true, and we have GeoIP data, and we're a bridge, keep a per-country
* count of how many client addresses have contacted us so that we can help
* the bridge authority guess which countries have blocked access to us. */