diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-11-21 18:36:49 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-11-21 18:36:49 -0500 |
| commit | 6a76007b089a2ca31b67b2ce15dd28edeb416428 (patch) | |
| tree | d61bc05bc50b9f4ac8782f321ae6af960c8fa9db /src/or/or.h | |
| parent | c9f24edb13faf17dc314be51127736acfc3de17a (diff) | |
| parent | 97a209ea28f1b64fba51157e3e695c676eb0cf8e (diff) | |
| download | tor-6a76007b089a2ca31b67b2ce15dd28edeb416428.tar.gz tor-6a76007b089a2ca31b67b2ce15dd28edeb416428.zip | |
Merge branch 'maint-0.2.2'
Conflicts:
src/or/dirserv.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 259ae5c989..67ba62bdd6 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3162,6 +3162,14 @@ typedef struct { * exploitation of CVE-2011-2768 against their clients? */ int GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays; + /** If non-zero, always vote the Fast flag for any relay advertising + * this amount of capacity or more. */ + uint64_t AuthDirFastGuarantee; + + /** If non-zero, this advertised capacity or more is always sufficient + * to satisfy the bandwidth requirement for the Guard flag. */ + uint64_t AuthDirGuardBWGuarantee; + char *AccountingStart; /**< How long is the accounting interval, and when * does it start? */ uint64_t AccountingMax; /**< How many bytes do we allow per accounting |