diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:23:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:23:03 -0400 |
| commit | d3063da691d0006cf41f6406099f056ab47c543a (patch) | |
| tree | c44651600763ef302359589515e76dfb08cb56d4 /src/or/config.c | |
| parent | 9e45d940d466bcefcd1490fc2ae0e5a6298a846f (diff) | |
| parent | c37fdc2eef0ccfeff56df5a9b7dfae9396fc643c (diff) | |
| download | tor-d3063da691d0006cf41f6406099f056ab47c543a.tar tor-d3063da691d0006cf41f6406099f056ab47c543a.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/config.c
src/or/relay.c
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index df1a67ea4..55d19b8e2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -299,6 +299,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"), OBSOLETE("MaxOnionsPending"), V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), V(MinMeasuredBWsForAuthToIgnoreAdvertised, INT, "500"), @@ -2610,7 +2611,14 @@ 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. " + "Ideally, have it as large as you can afford."); + options->MaxMemInCellQueues = (500 << 20); + } + options->AllowInvalid_ = 0; + if (options->AllowInvalidNodes) { SMARTLIST_FOREACH_BEGIN(options->AllowInvalidNodes, const char *, cp) { if (!strcasecmp(cp, "entry")) |