commit 4f37919fa1fd66daf2913203af3f51be60771fcb Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 18 13:55:23 2016 -0400

Change UseOptimisticData default to 1.

This lets us use optimistic data for downloading our initial consensus.

Closes ticket 18815. --- changes/bug18815 | 3 +++ src/or/circuituse.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/changes/bug18815 b/changes/bug18815 new file mode 100644 index 0000000..cb504b2 --- /dev/null +++ b/changes/bug18815 @@ -0,0 +1,3 @@ + o Minor features (performance): + - When fetching a consensus for the first time, use optimistic data. + This saves a round-trip during startup. Closes ticket 18815. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 31003ea..e4eef2c 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -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;