diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-01-08 15:52:22 -0800 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-08 15:52:22 -0800 |
| commit | 95f5910810de88725c86a854db1c1653ec19f724 (patch) | |
| tree | cf68cb833b0ee98125bd18cdf69e35e844e968eb /src/or/config.c | |
| parent | 5b5abd8c038b88cba7078a105b0896cd151ee509 (diff) | |
| parent | 4f0e28977d6376ccba599e7089aeb9e3b4f25e5f (diff) | |
| download | tor-95f5910810de88725c86a854db1c1653ec19f724.tar.gz tor-95f5910810de88725c86a854db1c1653ec19f724.zip | |
Merge branch 'unixninja_ticket15989_squashed'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index c1db844bc3..b7744bab6a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3458,8 +3458,12 @@ options_validate(or_options_t *old_options, or_options_t *options, options->AccountingRule = ACCT_SUM; else if (!strcmp(options->AccountingRule_option, "max")) options->AccountingRule = ACCT_MAX; + else if (!strcmp(options->AccountingRule_option, "in")) + options->AccountingRule = ACCT_IN; + else if (!strcmp(options->AccountingRule_option, "out")) + options->AccountingRule = ACCT_OUT; else - REJECT("AccountingRule must be 'sum' or 'max'"); + REJECT("AccountingRule must be 'sum', 'max', 'in', or 'out'"); } if (options->DirPort_set && !options->DirCache) { |