diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-25 11:22:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-25 11:22:12 -0500 |
| commit | aa178aae03048caf24ce5df4b2d643c7e7afdc7b (patch) | |
| tree | 62c06c2a1dc0f278dcd7f6d184bdf90dee81234d /src/or/config.c | |
| parent | 16b8b9b00f414343030c29990930c0e52a01fd84 (diff) | |
| parent | 0642b927928df4ec556a76fed4b0b4523d515a7d (diff) | |
| download | tor-aa178aae03048caf24ce5df4b2d643c7e7afdc7b.tar.gz tor-aa178aae03048caf24ce5df4b2d643c7e7afdc7b.zip | |
Merge branch 'bug1863_bwhist' into maint-0.2.2
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 178ed1e385..4d2c872459 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -446,15 +446,19 @@ static config_var_t _state_vars[] = { V(BWHistoryReadEnds, ISOTIME, NULL), V(BWHistoryReadInterval, UINT, "900"), V(BWHistoryReadValues, CSV, ""), + V(BWHistoryReadMaxima, CSV, ""), V(BWHistoryWriteEnds, ISOTIME, NULL), V(BWHistoryWriteInterval, UINT, "900"), V(BWHistoryWriteValues, CSV, ""), + V(BWHistoryWriteMaxima, CSV, ""), V(BWHistoryDirReadEnds, ISOTIME, NULL), V(BWHistoryDirReadInterval, UINT, "900"), V(BWHistoryDirReadValues, CSV, ""), + V(BWHistoryDirReadMaxima, CSV, ""), V(BWHistoryDirWriteEnds, ISOTIME, NULL), V(BWHistoryDirWriteInterval, UINT, "900"), V(BWHistoryDirWriteValues, CSV, ""), + V(BWHistoryDirWriteMaxima, CSV, ""), V(TorVersion, STRING, NULL), |