diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-09-21 14:29:59 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-09-21 14:29:59 -0400 |
commit | e476ffc2ba1423bf9a51a124bc4de9aba4eda120 (patch) | |
tree | 4f3825e62fed5696b8bbf04568fd601ef31811dd /src/or/config.c | |
parent | fb34c66e83790bf03b163555128565823a3e58fe (diff) | |
parent | 9cba61eb8c76480316fb149b1a90ef3abb6818fb (diff) | |
download | tor-e476ffc2ba1423bf9a51a124bc4de9aba4eda120.tar.gz tor-e476ffc2ba1423bf9a51a124bc4de9aba4eda120.zip |
Merge branch 'bug1789'
Diffstat (limited to 'src/or/config.c')
-rw-r--r-- | src/or/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 6b3bcf6da8..73b96fdc72 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -428,6 +428,9 @@ static config_var_t _state_vars[] = { V(AccountingExpectedUsage, MEMUNIT, NULL), V(AccountingIntervalStart, ISOTIME, NULL), V(AccountingSecondsActive, INTERVAL, NULL), + V(AccountingSecondsToReachSoftLimit,INTERVAL, NULL), + V(AccountingSoftLimitHitAt, ISOTIME, NULL), + V(AccountingBytesAtSoftLimit, MEMUNIT, NULL), VAR("EntryGuard", LINELIST_S, EntryGuards, NULL), VAR("EntryGuardDownSince", LINELIST_S, EntryGuards, NULL), |