diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-11 14:12:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-11 14:12:39 -0400 |
| commit | e3a4511049162b2560b80a70c6c2596fcb34dd34 (patch) | |
| tree | 19966203a80e4b697b7a9c72ed6e81d754120b74 /src/or/circuituse.c | |
| parent | 48b7db35590afee77fb608b46328959e8a9b2d31 (diff) | |
| parent | 4f37919fa1fd66daf2913203af3f51be60771fcb (diff) | |
| download | tor-e3a4511049162b2560b80a70c6c2596fcb34dd34.tar.gz tor-e3a4511049162b2560b80a70c6c2596fcb34dd34.zip | |
Merge remote-tracking branch 'public/bug18815'
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 b5959944f1..311af5dfbe 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; |