|
@@ -2141,10 +2141,11 @@ optimistic_data_enabled(void)
|
|
|
{
|
|
|
const or_options_t *options = get_options();
|
|
|
if (options->OptimisticData < 0) {
|
|
|
- /* XXX023 consider having auto default to 1 rather than 0 before
|
|
|
- * the 0.2.3 branch goes stable. See bug 3617. -RD */
|
|
|
+ /* Note: this default was 0 before #18815 was merged. We can't take the
|
|
|
+ * parameter out of the consensus until versions before that are all
|
|
|
+ * obsolete. */
|
|
|
const int32_t enabled =
|
|
|
- networkstatus_get_param(NULL, "UseOptimisticData", 0, 0, 1);
|
|
|
+ networkstatus_get_param(NULL, "UseOptimisticData", /*default*/ 1, 0, 1);
|
|
|
return (int)enabled;
|
|
|
}
|
|
|
return options->OptimisticData;
|