diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-18 13:55:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-18 13:55:23 -0400 |
| commit | 4f37919fa1fd66daf2913203af3f51be60771fcb (patch) | |
| tree | dc7230ca197b59785903d06ac679e54a58cad5e4 /src/or/circuituse.c | |
| parent | 12e26a6e7691d1c7dddfe07c8a72ffac6d586707 (diff) | |
| download | tor-4f37919fa1fd66daf2913203af3f51be60771fcb.tar.gz tor-4f37919fa1fd66daf2913203af3f51be60771fcb.zip | |
Change UseOptimisticData default to 1.
This lets us use optimistic data for downloading our initial
consensus.
Closes ticket 18815.
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 31003ea095..e4eef2cf6c 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; |