diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-25 11:24:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-25 11:24:35 -0500 |
| commit | a2a8adeee5a3176c3173a85c903c72c5c03ac729 (patch) | |
| tree | 9ee6f2b545df707e38c0babe0bc590f3af82af5d /src/or/config.c | |
| parent | 0a6beb936866447742d1117eefcfeef2e62326fc (diff) | |
| parent | aa178aae03048caf24ce5df4b2d643c7e7afdc7b (diff) | |
| download | tor-a2a8adeee5a3176c3173a85c903c72c5c03ac729.tar.gz tor-a2a8adeee5a3176c3173a85c903c72c5c03ac729.zip | |
Merge remote branch 'origin/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 aa4d9743b2..769831b2c4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -455,15 +455,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), |