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/or.h | |
| parent | 5b5abd8c038b88cba7078a105b0896cd151ee509 (diff) | |
| parent | 4f0e28977d6376ccba599e7089aeb9e3b4f25e5f (diff) | |
| download | tor-95f5910810de88725c86a854db1c1653ec19f724.tar.gz tor-95f5910810de88725c86a854db1c1653ec19f724.zip | |
Merge branch 'unixninja_ticket15989_squashed'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index 6b5bd86761..52bf33720a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3893,9 +3893,11 @@ typedef struct { * hibernate." */ /** How do we determine when our AccountingMax has been reached? * "max" for when in or out reaches AccountingMax - * "sum" for when in plus out reaches AccountingMax */ + * "sum" for when in plus out reaches AccountingMax + * "in" for when in reaches AccountingMax + * "out" for when out reaches AccountingMax */ char *AccountingRule_option; - enum { ACCT_MAX, ACCT_SUM } AccountingRule; + enum { ACCT_MAX, ACCT_SUM, ACCT_IN, ACCT_OUT } AccountingRule; /** Base64-encoded hash of accepted passwords for the control system. */ config_line_t *HashedControlPassword; |