diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-02-12 12:44:58 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-02-12 12:44:58 -0500 |
commit | 87fb1e324c1b3214765c46bec3d9ec6adc3fa83d (patch) | |
tree | 000e1e6d7d42f160bbd77aaf786a65971696ef19 /src/or/config.c | |
parent | 10d4d3e2d58f94418ca9554aee251232bbaaab99 (diff) | |
parent | 05d8111eedee9e11e4bb1c42e93ae2fc168d52ec (diff) | |
download | tor-87fb1e324c1b3214765c46bec3d9ec6adc3fa83d.tar tor-87fb1e324c1b3214765c46bec3d9ec6adc3fa83d.tar.gz |
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2
Conflicts:
src/or/circuitlist.c
Diffstat (limited to 'src/or/config.c')
-rw-r--r-- | src/or/config.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index d2981771c..e5694e46e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -85,6 +85,7 @@ static config_abbrev_t option_abbrevs_[] = { { "DirFetchPostPeriod", "StatusFetchPeriod", 0, 0}, { "DirServer", "DirAuthority", 0, 0}, /* XXXX024 later, make this warn? */ { "MaxConn", "ConnLimit", 0, 1}, + { "MaxMemInCellQueues", "MaxMemInQueues", 0, 0}, { "ORBindAddress", "ORListenAddress", 0, 0}, { "DirBindAddress", "DirListenAddress", 0, 0}, { "SocksBindAddress", "SocksListenAddress", 0, 0}, @@ -306,7 +307,7 @@ static config_var_t option_vars_[] = { V(MaxAdvertisedBandwidth, MEMUNIT, "1 GB"), V(MaxCircuitDirtiness, INTERVAL, "10 minutes"), V(MaxClientCircuitsPending, UINT, "32"), - V(MaxMemInCellQueues, MEMUNIT, "8 GB"), + V(MaxMemInQueues, MEMUNIT, "8 GB"), OBSOLETE("MaxOnionsPending"), V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), V(MinMeasuredBWsForAuthToIgnoreAdvertised, INT, "500"), @@ -2754,10 +2755,10 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("If EntryNodes is set, UseEntryGuards must be enabled."); } - if (options->MaxMemInCellQueues < (500 << 20)) { - log_warn(LD_CONFIG, "MaxMemInCellQueues must be at least 500 MB for now. " + if (options->MaxMemInQueues < (256 << 20)) { + log_warn(LD_CONFIG, "MaxMemInQueues must be at least 256 MB for now. " "Ideally, have it as large as you can afford."); - options->MaxMemInCellQueues = (500 << 20); + options->MaxMemInQueues = (256 << 20); } options->AllowInvalid_ = 0; |